zhouxingyu 1 vecka sedan
förälder
incheckning
b0514ff764

+ 6 - 6
lg-code/src/main/java/org/jeecg/modules/Contact/controller/ContactController.java

@@ -66,7 +66,7 @@ public class ContactController extends JeecgController<Contact, IContactService>
 	 */
 	@AutoLog(value = "通讯录-添加")
 	@ApiOperation(value="通讯录-添加", notes="通讯录-添加")
-	@RequiresPermissions("base:contact:add")
+	//@RequiresPermissions("lg:contact:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Contact contact) {
 		contactService.save(contact);
@@ -81,7 +81,7 @@ public class ContactController extends JeecgController<Contact, IContactService>
 	 */
 	@AutoLog(value = "通讯录-编辑")
 	@ApiOperation(value="通讯录-编辑", notes="通讯录-编辑")
-	@RequiresPermissions("base:contact:edit")
+	@RequiresPermissions("lg:contact:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Contact contact) {
 		contactService.updateById(contact);
@@ -96,7 +96,7 @@ public class ContactController extends JeecgController<Contact, IContactService>
 	 */
 	@AutoLog(value = "通讯录-通过id删除")
 	@ApiOperation(value="通讯录-通过id删除", notes="通讯录-通过id删除")
-	@RequiresPermissions("base:contact:delete")
+	@RequiresPermissions("lg:contact:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		contactService.removeById(id);
@@ -111,7 +111,7 @@ public class ContactController extends JeecgController<Contact, IContactService>
 	 */
 	@AutoLog(value = "通讯录-批量删除")
 	@ApiOperation(value="通讯录-批量删除", notes="通讯录-批量删除")
-	@RequiresPermissions("base:contact:deleteBatch")
+	@RequiresPermissions("lg:contact:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.contactService.removeByIds(Arrays.asList(ids.split(",")));
@@ -141,7 +141,7 @@ public class ContactController extends JeecgController<Contact, IContactService>
     * @param request
     * @param contact
     */
-    @RequiresPermissions("base:contact:exportXls")
+    @RequiresPermissions("lg:contact:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Contact contact) {
         return super.exportXls(request, contact, Contact.class, "通讯录");
@@ -154,7 +154,7 @@ public class ContactController extends JeecgController<Contact, IContactService>
     * @param response
     * @return
     */
-    @RequiresPermissions("base:contact:importExcel")
+    @RequiresPermissions("lg:contact:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, Contact.class);

+ 12 - 0
lg-code/src/main/java/org/jeecg/modules/Contact/entity/Contact.java

@@ -1,16 +1,19 @@
 package org.jeecg.modules.Contact.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 通讯录
@@ -46,4 +49,13 @@ public class Contact implements Serializable {
 	@Excel(name = "是否启用", width = 15)
     @ApiModelProperty(value = "是否启用")
     private Integer isActive;
+    /**创建时间*/
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**删除标记*/
+    @ApiModelProperty(value = "删除标记")
+    private int isDel;
 }

+ 14 - 0
lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/entity/DefectiveProduct.java

@@ -1,14 +1,18 @@
 package org.jeecg.modules.DefectiveProduct.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: defective_product
@@ -53,4 +57,14 @@ public class DefectiveProduct implements Serializable {
 	/**remark*/
 	@Excel(name = "remark", width = 15)
     private String remark;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**删除标记*/
+	@ApiModelProperty(value = "删除标记")
+	private int isDel;
+
 }

+ 14 - 0
lg-code/src/main/java/org/jeecg/modules/DestRule/entity/DestRule.java

@@ -1,14 +1,18 @@
 package org.jeecg.modules.DestRule.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: dest_rule
@@ -38,4 +42,14 @@ public class DestRule implements Serializable {
 	/**sub*/
 	@Excel(name = "sub", width = 15)
     private String sub;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**删除标记*/
+	@ApiModelProperty(value = "删除标记")
+	private int isDel;
+
 }

+ 14 - 0
lg-code/src/main/java/org/jeecg/modules/ReasonRule/entity/ReasonRule.java

@@ -1,14 +1,18 @@
 package org.jeecg.modules.ReasonRule.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: reason_rule
@@ -35,4 +39,14 @@ public class ReasonRule implements Serializable {
 	/**remark*/
 	@Excel(name = "remark", width = 15)
     private String remark;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**删除标记*/
+	@ApiModelProperty(value = "删除标记")
+	private int isDel;
+
 }

+ 12 - 2
lg-code/src/main/java/org/jeecg/modules/RegionRule/controller/RegionRuleController.java

@@ -5,6 +5,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.jeecg.modules.RegionRule.entity.RegionRule;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -17,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.RegionRule.service.IRegionRuleService;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -25,14 +28,15 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
  * @Description: 国别基准
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-05-28
  * @Version: V1.0
  */
+@Api(tags="国别基准")
 @RestController
 @RequestMapping("/regionRule")
 @Slf4j
 public class RegionRuleController extends JeecgController<RegionRule, IRegionRuleService> {
-	 @Resource
+	@Autowired
 	private IRegionRuleService regionRuleService;
 
 	/**
@@ -45,6 +49,7 @@ public class RegionRuleController extends JeecgController<RegionRule, IRegionRul
 	 * @return
 	 */
 	//@AutoLog(value = "国别基准-分页列表查询")
+	@ApiOperation(value="国别基准-分页列表查询", notes="国别基准-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<RegionRule>> queryPageList(RegionRule regionRule,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -65,6 +70,7 @@ public class RegionRuleController extends JeecgController<RegionRule, IRegionRul
 	 * @return
 	 */
 	@AutoLog(value = "国别基准-添加")
+	@ApiOperation(value="国别基准-添加", notes="国别基准-添加")
 	@RequiresPermissions("lg:region_rule:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody RegionRule regionRule) {
@@ -80,6 +86,7 @@ public class RegionRuleController extends JeecgController<RegionRule, IRegionRul
 	 * @return
 	 */
 	@AutoLog(value = "国别基准-编辑")
+	@ApiOperation(value="国别基准-编辑", notes="国别基准-编辑")
 	@RequiresPermissions("lg:region_rule:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody RegionRule regionRule) {
@@ -94,6 +101,7 @@ public class RegionRuleController extends JeecgController<RegionRule, IRegionRul
 	 * @return
 	 */
 	@AutoLog(value = "国别基准-通过id删除")
+	@ApiOperation(value="国别基准-通过id删除", notes="国别基准-通过id删除")
 	@RequiresPermissions("lg:region_rule:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -108,6 +116,7 @@ public class RegionRuleController extends JeecgController<RegionRule, IRegionRul
 	 * @return
 	 */
 	@AutoLog(value = "国别基准-批量删除")
+	@ApiOperation(value="国别基准-批量删除", notes="国别基准-批量删除")
 	@RequiresPermissions("lg:region_rule:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -122,6 +131,7 @@ public class RegionRuleController extends JeecgController<RegionRule, IRegionRul
 	 * @return
 	 */
 	//@AutoLog(value = "国别基准-通过id查询")
+	@ApiOperation(value="国别基准-通过id查询", notes="国别基准-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<RegionRule> queryById(@RequestParam(name="id",required=true) String id) {
 		RegionRule regionRule = regionRuleService.getById(id);

+ 14 - 0
lg-code/src/main/java/org/jeecg/modules/RegionRule/entity/RegionRule.java

@@ -1,14 +1,18 @@
 package org.jeecg.modules.RegionRule.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 国别基准
@@ -59,4 +63,14 @@ public class RegionRule implements Serializable {
 	/**fri*/
 	@Excel(name = "fri", width = 15)
     private String fri;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**删除标记*/
+	@ApiModelProperty(value = "删除标记")
+	private int isDel;
+
 }