Browse Source

初始化

zhouxingyu 1 week ago
parent
commit
66fdecf4b4
40 changed files with 336 additions and 439 deletions
  1. 5 1
      jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
  2. 7 2
      jeecg-module-system/jeecg-system-start/pom.xml
  3. 5 5
      jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
  4. 1 1
      jeecg-module-system/pom.xml
  5. 2 0
      lg-code/pom.xml
  6. 0 173
      lg-code/src/main/java/org.jeecg.lg/Contact/controller/LgContactController.java
  7. 0 17
      lg-code/src/main/java/org.jeecg.lg/Contact/mapper/LgContactMapper.java
  8. 0 14
      lg-code/src/main/java/org.jeecg.lg/Contact/service/ILgContactService.java
  9. 0 20
      lg-code/src/main/java/org.jeecg.lg/Contact/service/impl/LgContactServiceImpl.java
  10. 163 0
      lg-code/src/main/java/org/jeecg/modules/Contact/controller/ContactController.java
  11. 13 13
      lg-code/src/main/java/org/jeecg/modules/Contact/entity/Contact.java
  12. 14 0
      lg-code/src/main/java/org/jeecg/modules/Contact/mapper/ContactMapper.java
  13. 2 2
      lg-code/src/main/java/org/jeecg/modules/Contact/mapper/xml/ContactMapper.xml
  14. 14 0
      lg-code/src/main/java/org/jeecg/modules/Contact/service/IContactService.java
  15. 19 0
      lg-code/src/main/java/org/jeecg/modules/Contact/service/impl/ContactServiceImpl.java
  16. 6 24
      lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/controller/DefectiveProductController.java
  17. 2 10
      lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/entity/DefectiveProduct.java
  18. 4 6
      lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/mapper/DefectiveProductMapper.java
  19. 2 2
      lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/mapper/xml/DefectiveProductMapper.xml
  20. 3 2
      lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/service/IDefectiveProductService.java
  21. 5 4
      lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/service/impl/DefectiveProductServiceImpl.java
  22. 7 23
      lg-code/src/main/java/org/jeecg/modules/DestRule/controller/DestRuleController.java
  23. 2 10
      lg-code/src/main/java/org/jeecg/modules/DestRule/entity/DestRule.java
  24. 4 5
      lg-code/src/main/java/org/jeecg/modules/DestRule/mapper/DestRuleMapper.java
  25. 2 2
      lg-code/src/main/java/org/jeecg/modules/DestRule/mapper/xml/DestRuleMapper.xml
  26. 2 2
      lg-code/src/main/java/org/jeecg/modules/DestRule/service/IDestRuleService.java
  27. 4 4
      lg-code/src/main/java/org/jeecg/modules/DestRule/service/impl/DestRuleServiceImpl.java
  28. 7 23
      lg-code/src/main/java/org/jeecg/modules/ReasonRule/controller/ReasonRuleController.java
  29. 2 10
      lg-code/src/main/java/org/jeecg/modules/ReasonRule/entity/ReasonRule.java
  30. 4 5
      lg-code/src/main/java/org/jeecg/modules/ReasonRule/mapper/ReasonRuleMapper.java
  31. 2 2
      lg-code/src/main/java/org/jeecg/modules/ReasonRule/mapper/xml/ReasonRuleMapper.xml
  32. 2 2
      lg-code/src/main/java/org/jeecg/modules/ReasonRule/service/IReasonRuleService.java
  33. 4 4
      lg-code/src/main/java/org/jeecg/modules/ReasonRule/service/impl/ReasonRuleServiceImpl.java
  34. 7 23
      lg-code/src/main/java/org/jeecg/modules/RegionRule/controller/RegionRuleController.java
  35. 2 10
      lg-code/src/main/java/org/jeecg/modules/RegionRule/entity/RegionRule.java
  36. 4 5
      lg-code/src/main/java/org/jeecg/modules/RegionRule/mapper/RegionRuleMapper.java
  37. 2 2
      lg-code/src/main/java/org/jeecg/modules/RegionRule/mapper/xml/RegionRuleMapper.xml
  38. 2 2
      lg-code/src/main/java/org/jeecg/modules/RegionRule/service/IRegionRuleService.java
  39. 4 4
      lg-code/src/main/java/org/jeecg/modules/RegionRule/service/impl/RegionRuleServiceImpl.java
  40. 6 5
      pom.xml

+ 5 - 1
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -85,7 +85,7 @@ public class LoginUser {
 	 * 状态(1:正常 2:冻结 )
 	 */
 	private Integer status;
-	
+
 	private Integer delFlag;
 	/**
      * 同步工作流引擎1同步0不同步
@@ -127,4 +127,8 @@ public class LoginUser {
 	/**设备id uniapp推送用*/
 	private String clientId;
 
+	private String userDepartment;
+
+	private String supplierId;
+
 }

+ 7 - 2
jeecg-module-system/jeecg-system-start/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jeecg-system-start</artifactId>
-    
+
     <dependencies>
         <!-- SYSTEM 系统管理模块 -->
         <dependency>
@@ -48,6 +48,11 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.cuidian.lg</groupId>
+            <artifactId>lg-code</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -59,4 +64,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

+ 5 - 5
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -159,8 +159,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://127.0.0.1:3306/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: sj
-          password: 123qwe
+          username: root
+          password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -173,10 +173,10 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: '1215225'
+    password: zxy,1997818
 #mybatis plus 设置
 mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:com/cuidian/**/xml/*Mapper.xml
   global-config:
     # 关闭MP3.0自带的banner
     banner: false
@@ -239,7 +239,7 @@ jeecg:
   #大屏报表参数设置
   jmreport:
     #多租户模式,默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
-    saasMode: 
+    saasMode:
     # 平台上线安全配置(v1.6.2+ 新增)
     firewall:
       # 数据源安全 (开启后,不允许使用平台数据源、SQL解析加签并且不允许查询数据库)

+ 1 - 1
jeecg-module-system/pom.xml

@@ -18,4 +18,4 @@
         <module>jeecg-system-start</module>
     </modules>
 
-</project>
+</project>

+ 2 - 0
lg-code/pom.xml

@@ -9,7 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.cuidian.lg</groupId>
     <artifactId>lg-code</artifactId>
+    <version>1.0.0</version>
 
     <dependencies>
         <dependency>

+ 0 - 173
lg-code/src/main/java/org.jeecg.lg/Contact/controller/LgContactController.java

@@ -1,173 +0,0 @@
-package org.jeecg.lg.Contact.controller;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.lg.Contact.entity.LgContact;
-import org.jeecg.lg.Contact.service.ILgContactService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
- /**
- * @Description: contact
- * @Author: jeecg-boot
- * @Date:   2025-05-22
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/lg/lgContact")
-@Slf4j
-public class LgContactController extends JeecgController<LgContact, ILgContactService> {
-	@Autowired
-	private ILgContactService lgContactService;
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param lgContact
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "contact-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<LgContact>> queryPageList(LgContact lgContact,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-
-
-        QueryWrapper<LgContact> queryWrapper = QueryGenerator.initQueryWrapper(lgContact, req.getParameterMap());
-		Page<LgContact> page = new Page<LgContact>(pageNo, pageSize);
-		IPage<LgContact> pageList = lgContactService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param lgContact
-	 * @return
-	 */
-	@AutoLog(value = "contact-添加")
-	@RequiresPermissions("lg:lg_contact:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody LgContact lgContact) {
-		lgContactService.save(lgContact);
-
-		return Result.OK("添加成功!");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param lgContact
-	 * @return
-	 */
-	@AutoLog(value = "contact-编辑")
-	@RequiresPermissions("lg:lg_contact:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody LgContact lgContact) {
-		lgContactService.updateById(lgContact);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "contact-通过id删除")
-	@RequiresPermissions("lg:lg_contact:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		lgContactService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "contact-批量删除")
-	@RequiresPermissions("lg:lg_contact:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.lgContactService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "contact-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<LgContact> queryById(@RequestParam(name="id",required=true) String id) {
-		LgContact lgContact = lgContactService.getById(id);
-		if(lgContact==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(lgContact);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param lgContact
-    */
-    @RequiresPermissions("lg:lg_contact:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, LgContact lgContact) {
-        return super.exportXls(request, lgContact, LgContact.class, "contact");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequiresPermissions("lg:lg_contact:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, LgContact.class);
-    }
-
-}

+ 0 - 17
lg-code/src/main/java/org.jeecg.lg/Contact/mapper/LgContactMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.lg.Contact.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.lg.Contact.entity.LgContact;
-
-/**
- * @Description: contact
- * @Author: jeecg-boot
- * @Date:   2025-05-22
- * @Version: V1.0
- */
-public interface LgContactMapper extends BaseMapper<LgContact> {
-
-}

+ 0 - 14
lg-code/src/main/java/org.jeecg.lg/Contact/service/ILgContactService.java

@@ -1,14 +0,0 @@
-package org.jeecg.lg.Contact.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.lg.Contact.entity.LgContact;
-
-/**
- * @Description: contact
- * @Author: jeecg-boot
- * @Date:   2025-05-22
- * @Version: V1.0
- */
-public interface ILgContactService extends IService<LgContact> {
-
-}

+ 0 - 20
lg-code/src/main/java/org.jeecg.lg/Contact/service/impl/LgContactServiceImpl.java

@@ -1,20 +0,0 @@
-package org.jeecg.lg.Contact.service.impl;
-
-
-import org.jeecg.lg.Contact.entity.LgContact;
-import org.jeecg.lg.Contact.mapper.LgContactMapper;
-import org.jeecg.lg.Contact.service.ILgContactService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: contact
- * @Author: jeecg-boot
- * @Date:   2025-05-22
- * @Version: V1.0
- */
-@Service
-public class LgContactServiceImpl extends ServiceImpl<LgContactMapper, LgContact> implements ILgContactService {
-
-}

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

@@ -0,0 +1,163 @@
+package org.jeecg.modules.Contact.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.Contact.entity.Contact;
+import org.jeecg.modules.Contact.service.IContactService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+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;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 通讯录
+ * @Author: jeecg-boot
+ * @Date:   2025-05-27
+ * @Version: V1.0
+ */
+@Api(tags="通讯录")
+@RestController
+@RequestMapping("/contact")
+@Slf4j
+public class ContactController extends JeecgController<Contact, IContactService> {
+	@Autowired
+	private IContactService contactService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param contact
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "通讯录-分页列表查询")
+	@ApiOperation(value="通讯录-分页列表查询", notes="通讯录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<Contact>> queryPageList(Contact contact,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<Contact> queryWrapper = QueryGenerator.initQueryWrapper(contact, req.getParameterMap());
+		Page<Contact> page = new Page<Contact>(pageNo, pageSize);
+		IPage<Contact> pageList = contactService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param contact
+	 * @return
+	 */
+	@AutoLog(value = "通讯录-添加")
+	@ApiOperation(value="通讯录-添加", notes="通讯录-添加")
+	@RequiresPermissions("base:contact:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody Contact contact) {
+		contactService.save(contact);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param contact
+	 * @return
+	 */
+	@AutoLog(value = "通讯录-编辑")
+	@ApiOperation(value="通讯录-编辑", notes="通讯录-编辑")
+	@RequiresPermissions("base:contact:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody Contact contact) {
+		contactService.updateById(contact);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "通讯录-通过id删除")
+	@ApiOperation(value="通讯录-通过id删除", notes="通讯录-通过id删除")
+	@RequiresPermissions("base:contact:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		contactService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "通讯录-批量删除")
+	@ApiOperation(value="通讯录-批量删除", notes="通讯录-批量删除")
+	@RequiresPermissions("base:contact:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.contactService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "通讯录-通过id查询")
+	@ApiOperation(value="通讯录-通过id查询", notes="通讯录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<Contact> queryById(@RequestParam(name="id",required=true) String id) {
+		Contact contact = contactService.getById(id);
+		if(contact==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(contact);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param contact
+    */
+    @RequiresPermissions("base:contact:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, Contact contact) {
+        return super.exportXls(request, contact, Contact.class, "通讯录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("base:contact:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, Contact.class);
+    }
+
+}

+ 13 - 13
lg-code/src/main/java/org.jeecg.lg/Contact/entity/LgContact.java → lg-code/src/main/java/org/jeecg/modules/Contact/entity/Contact.java

@@ -1,49 +1,49 @@
-package org.jeecg.lg.Contact.entity;
+package org.jeecg.modules.Contact.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: contact
+ * @Description: 通讯录
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-05-27
  * @Version: V1.0
  */
 @Data
 @TableName("lg_contact")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-public class LgContact implements Serializable {
+@ApiModel(value="contact对象", description="通讯录")
+public class Contact implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
     private String id;
 	/**name*/
 	@Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
     private String name;
 	/**email*/
 	@Excel(name = "email", width = 15)
+    @ApiModelProperty(value = "email")
     private String email;
 	/**类型:发送、抄送*/
 	@Excel(name = "类型:发送、抄送", width = 15)
+    @ApiModelProperty(value = "类型:发送、抄送")
     private Integer recType;
 	/**是否启用*/
 	@Excel(name = "是否启用", width = 15)
+    @ApiModelProperty(value = "是否启用")
     private Integer isActive;
 }

+ 14 - 0
lg-code/src/main/java/org/jeecg/modules/Contact/mapper/ContactMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.Contact.mapper;
+
+import org.jeecg.modules.Contact.entity.Contact;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 通讯录
+ * @Author: jeecg-boot
+ * @Date:   2025-05-27
+ * @Version: V1.0
+ */
+public interface ContactMapper extends BaseMapper<Contact> {
+
+}

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/DestRule/mapper/xml/DestRuleMapper.xml → lg-code/src/main/java/org/jeecg/modules/Contact/mapper/xml/ContactMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.lg.mapper.DestRuleMapper">
+<mapper namespace="org.jeecg.modules.Contact.mapper.ContactMapper">
 
-</mapper>
+</mapper>

+ 14 - 0
lg-code/src/main/java/org/jeecg/modules/Contact/service/IContactService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.Contact.service;
+
+import org.jeecg.modules.Contact.entity.Contact;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 通讯录
+ * @Author: jeecg-boot
+ * @Date:   2025-05-27
+ * @Version: V1.0
+ */
+public interface IContactService extends IService<Contact> {
+
+}

+ 19 - 0
lg-code/src/main/java/org/jeecg/modules/Contact/service/impl/ContactServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.Contact.service.impl;
+
+import org.jeecg.modules.Contact.entity.Contact;
+import org.jeecg.modules.Contact.service.IContactService;
+import org.jeecg.modules.Contact.mapper.ContactMapper;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 通讯录
+ * @Author: jeecg-boot
+ * @Date:   2025-05-27
+ * @Version: V1.0
+ */
+@Service
+public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> implements IContactService {
+
+}

+ 6 - 24
lg-code/src/main/java/org.jeecg.lg/DefectiveProduct/controller/DefectiveProductController.java → lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/controller/DefectiveProductController.java

@@ -1,41 +1,23 @@
-package org.jeecg.lg.DefectiveProduct.controller;
+package org.jeecg.modules.DefectiveProduct.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import io.swagger.annotations.Tag;
+import org.jeecg.modules.DefectiveProduct.service.IDefectiveProductService;
+import org.jeecg.modules.DefectiveProduct.entity.DefectiveProduct;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecg.lg.DefectiveProduct.entity.DefectiveProduct;
-import org.jeecg.lg.DefectiveProduct.service.IDefectiveProductService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
@@ -46,10 +28,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 
 @RestController
-@RequestMapping("/lg/defectiveProduct")
+@RequestMapping("/defectiveProduct")
 @Slf4j
 public class DefectiveProductController extends JeecgController<DefectiveProduct, IDefectiveProductService> {
-	@Autowired
+	 @Resource
 	private IDefectiveProductService defectiveProductService;
 
 	/**

+ 2 - 10
lg-code/src/main/java/org.jeecg.lg/DefectiveProduct/entity/DefectiveProduct.java → lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/entity/DefectiveProduct.java

@@ -1,20 +1,12 @@
-package org.jeecg.lg.DefectiveProduct.entity;
+package org.jeecg.modules.DefectiveProduct.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 

+ 4 - 6
lg-code/src/main/java/org.jeecg.lg/DefectiveProduct/mapper/DefectiveProductMapper.java → lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/mapper/DefectiveProductMapper.java

@@ -1,11 +1,8 @@
-package org.jeecg.lg.DefectiveProduct.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
+package org.jeecg.modules.DefectiveProduct.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.lg.DefectiveProduct.entity.DefectiveProduct;
+import org.jeecg.modules.DefectiveProduct.entity.DefectiveProduct;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @Description: defective_product
@@ -13,6 +10,7 @@ import org.jeecg.lg.DefectiveProduct.entity.DefectiveProduct;
  * @Date:   2025-05-22
  * @Version: V1.0
  */
+@Mapper
 public interface DefectiveProductMapper extends BaseMapper<DefectiveProduct> {
 
 }

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/DefectiveProduct/mapper/xml/DefectiveProductMapper.xml → lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/mapper/xml/DefectiveProductMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.lg.mapper.DefectiveProductMapper">
+<mapper namespace="org.jeecg.modules.DefectiveProduct.mapper.DefectiveProductMapper">
 
-</mapper>
+</mapper>

+ 3 - 2
lg-code/src/main/java/org.jeecg.lg/DefectiveProduct/service/IDefectiveProductService.java → lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/service/IDefectiveProductService.java

@@ -1,7 +1,8 @@
-package org.jeecg.lg.DefectiveProduct.service;
+package org.jeecg.modules.DefectiveProduct.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.lg.DefectiveProduct.entity.DefectiveProduct;
+import org.jeecg.modules.DefectiveProduct.entity.DefectiveProduct;
+
 
 /**
  * @Description: defective_product

+ 5 - 4
lg-code/src/main/java/org.jeecg.lg/DefectiveProduct/service/impl/DefectiveProductServiceImpl.java → lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/service/impl/DefectiveProductServiceImpl.java

@@ -1,9 +1,10 @@
-package org.jeecg.lg.DefectiveProduct.service.impl;
+package org.jeecg.modules.DefectiveProduct.service.impl;
 
 
-import org.jeecg.lg.DefectiveProduct.entity.DefectiveProduct;
-import org.jeecg.lg.DefectiveProduct.mapper.DefectiveProductMapper;
-import org.jeecg.lg.DefectiveProduct.service.IDefectiveProductService;
+
+import org.jeecg.modules.DefectiveProduct.mapper.DefectiveProductMapper;
+import org.jeecg.modules.DefectiveProduct.service.IDefectiveProductService;
+import org.jeecg.modules.DefectiveProduct.entity.DefectiveProduct;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 7 - 23
lg-code/src/main/java/org.jeecg.lg/DestRule/controller/DestRuleController.java → lg-code/src/main/java/org/jeecg/modules/DestRule/controller/DestRuleController.java

@@ -1,39 +1,23 @@
-package org.jeecg.lg.DestRule.controller;
+package org.jeecg.modules.DestRule.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.modules.DestRule.entity.DestRule;
+import org.jeecg.modules.DestRule.service.IDestRuleService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecg.lg.DestRule.entity.DestRule;
-import org.jeecg.lg.DestRule.service.IDestRuleService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
@@ -43,10 +27,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Version: V1.0
  */
 @RestController
-@RequestMapping("/lg/destRule")
+@RequestMapping("/destRule")
 @Slf4j
 public class DestRuleController extends JeecgController<DestRule, IDestRuleService> {
-	@Autowired
+	 @Resource
 	private IDestRuleService destRuleService;
 
 	/**

+ 2 - 10
lg-code/src/main/java/org.jeecg.lg/DestRule/entity/DestRule.java → lg-code/src/main/java/org/jeecg/modules/DestRule/entity/DestRule.java

@@ -1,20 +1,12 @@
-package org.jeecg.lg.DestRule.entity;
+package org.jeecg.modules.DestRule.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 

+ 4 - 5
lg-code/src/main/java/org.jeecg.lg/DestRule/mapper/DestRuleMapper.java → lg-code/src/main/java/org/jeecg/modules/DestRule/mapper/DestRuleMapper.java

@@ -1,10 +1,8 @@
-package org.jeecg.lg.DestRule.mapper;
+package org.jeecg.modules.DestRule.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.lg.DestRule.entity.DestRule;
+import org.jeecg.modules.DestRule.entity.DestRule;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @Description: dest_rule
@@ -12,6 +10,7 @@ import org.jeecg.lg.DestRule.entity.DestRule;
  * @Date:   2025-05-22
  * @Version: V1.0
  */
+@Mapper
 public interface DestRuleMapper extends BaseMapper<DestRule> {
 
 }

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/Contact/mapper/xml/LgContactMapper.xml → lg-code/src/main/java/org/jeecg/modules/DestRule/mapper/xml/DestRuleMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.lg.mapper.LgContactMapper">
+<mapper namespace="org.jeecg.modules.DestRule.mapper.DestRuleMapper">
 
-</mapper>
+</mapper>

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/DestRule/service/IDestRuleService.java → lg-code/src/main/java/org/jeecg/modules/DestRule/service/IDestRuleService.java

@@ -1,7 +1,7 @@
-package org.jeecg.lg.DestRule.service;
+package org.jeecg.modules.DestRule.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.lg.DestRule.entity.DestRule;
+import org.jeecg.modules.DestRule.entity.DestRule;
 
 /**
  * @Description: dest_rule

+ 4 - 4
lg-code/src/main/java/org.jeecg.lg/DestRule/service/impl/DestRuleServiceImpl.java → lg-code/src/main/java/org/jeecg/modules/DestRule/service/impl/DestRuleServiceImpl.java

@@ -1,9 +1,9 @@
-package org.jeecg.lg.DestRule.service.impl;
+package org.jeecg.modules.DestRule.service.impl;
 
 
-import org.jeecg.lg.DestRule.entity.DestRule;
-import org.jeecg.lg.DestRule.mapper.DestRuleMapper;
-import org.jeecg.lg.DestRule.service.IDestRuleService;
+import org.jeecg.modules.DestRule.entity.DestRule;
+import org.jeecg.modules.DestRule.service.IDestRuleService;
+import org.jeecg.modules.DestRule.mapper.DestRuleMapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 7 - 23
lg-code/src/main/java/org.jeecg.lg/ReasonRule/controller/ReasonRuleController.java → lg-code/src/main/java/org/jeecg/modules/ReasonRule/controller/ReasonRuleController.java

@@ -1,39 +1,23 @@
-package org.jeecg.lg.ReasonRule.controller;
+package org.jeecg.modules.ReasonRule.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.modules.ReasonRule.entity.ReasonRule;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecg.lg.ReasonRule.entity.ReasonRule;
-import org.jeecg.lg.ReasonRule.service.IReasonRuleService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.modules.ReasonRule.service.IReasonRuleService;
 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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -44,10 +28,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Version: V1.0
  */
 @RestController
-@RequestMapping("/lg/reasonRule")
+@RequestMapping("/reasonRule")
 @Slf4j
 public class ReasonRuleController extends JeecgController<ReasonRule, IReasonRuleService> {
-	@Autowired
+	 @Resource
 	private IReasonRuleService reasonRuleService;
 
 	/**

+ 2 - 10
lg-code/src/main/java/org.jeecg.lg/ReasonRule/entity/ReasonRule.java → lg-code/src/main/java/org/jeecg/modules/ReasonRule/entity/ReasonRule.java

@@ -1,20 +1,12 @@
-package org.jeecg.lg.ReasonRule.entity;
+package org.jeecg.modules.ReasonRule.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 

+ 4 - 5
lg-code/src/main/java/org.jeecg.lg/ReasonRule/mapper/ReasonRuleMapper.java → lg-code/src/main/java/org/jeecg/modules/ReasonRule/mapper/ReasonRuleMapper.java

@@ -1,10 +1,8 @@
-package org.jeecg.lg.ReasonRule.mapper;
+package org.jeecg.modules.ReasonRule.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.lg.ReasonRule.entity.ReasonRule;
+import org.jeecg.modules.ReasonRule.entity.ReasonRule;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @Description: reason_rule
@@ -12,6 +10,7 @@ import org.jeecg.lg.ReasonRule.entity.ReasonRule;
  * @Date:   2025-05-22
  * @Version: V1.0
  */
+@Mapper
 public interface ReasonRuleMapper extends BaseMapper<ReasonRule> {
 
 }

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/ReasonRule/mapper/xml/ReasonRuleMapper.xml → lg-code/src/main/java/org/jeecg/modules/ReasonRule/mapper/xml/ReasonRuleMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.lg.mapper.ReasonRuleMapper">
+<mapper namespace="org.jeecg.modules.ReasonRule.mapper.ReasonRuleMapper">
 
-</mapper>
+</mapper>

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/ReasonRule/service/IReasonRuleService.java → lg-code/src/main/java/org/jeecg/modules/ReasonRule/service/IReasonRuleService.java

@@ -1,7 +1,7 @@
-package org.jeecg.lg.ReasonRule.service;
+package org.jeecg.modules.ReasonRule.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.lg.ReasonRule.entity.ReasonRule;
+import org.jeecg.modules.ReasonRule.entity.ReasonRule;
 
 /**
  * @Description: reason_rule

+ 4 - 4
lg-code/src/main/java/org.jeecg.lg/ReasonRule/service/impl/ReasonRuleServiceImpl.java → lg-code/src/main/java/org/jeecg/modules/ReasonRule/service/impl/ReasonRuleServiceImpl.java

@@ -1,9 +1,9 @@
-package org.jeecg.lg.ReasonRule.service.impl;
+package org.jeecg.modules.ReasonRule.service.impl;
 
 
-import org.jeecg.lg.ReasonRule.entity.ReasonRule;
-import org.jeecg.lg.ReasonRule.mapper.ReasonRuleMapper;
-import org.jeecg.lg.ReasonRule.service.IReasonRuleService;
+import org.jeecg.modules.ReasonRule.entity.ReasonRule;
+import org.jeecg.modules.ReasonRule.service.IReasonRuleService;
+import org.jeecg.modules.ReasonRule.mapper.ReasonRuleMapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 7 - 23
lg-code/src/main/java/org.jeecg.lg/RegionRule/controller/RegionRuleController.java → lg-code/src/main/java/org/jeecg/modules/RegionRule/controller/RegionRuleController.java

@@ -1,19 +1,13 @@
-package org.jeecg.lg.RegionRule.controller;
+package org.jeecg.modules.RegionRule.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.modules.RegionRule.entity.RegionRule;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,20 +15,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecg.lg.RegionRule.entity.RegionRule;
-import org.jeecg.lg.RegionRule.service.IRegionRuleService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -45,10 +29,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Version: V1.0
  */
 @RestController
-@RequestMapping("/lg/regionRule")
+@RequestMapping("/regionRule")
 @Slf4j
 public class RegionRuleController extends JeecgController<RegionRule, IRegionRuleService> {
-	@Autowired
+	 @Resource
 	private IRegionRuleService regionRuleService;
 
 	/**

+ 2 - 10
lg-code/src/main/java/org.jeecg.lg/RegionRule/entity/RegionRule.java → lg-code/src/main/java/org/jeecg/modules/RegionRule/entity/RegionRule.java

@@ -1,20 +1,12 @@
-package org.jeecg.lg.RegionRule.entity;
+package org.jeecg.modules.RegionRule.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 

+ 4 - 5
lg-code/src/main/java/org.jeecg.lg/RegionRule/mapper/RegionRuleMapper.java → lg-code/src/main/java/org/jeecg/modules/RegionRule/mapper/RegionRuleMapper.java

@@ -1,10 +1,8 @@
-package org.jeecg.lg.RegionRule.mapper;
+package org.jeecg.modules.RegionRule.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.lg.RegionRule.entity.RegionRule;
+import org.jeecg.modules.RegionRule.entity.RegionRule;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @Description: 国别基准
@@ -12,6 +10,7 @@ import org.jeecg.lg.RegionRule.entity.RegionRule;
  * @Date:   2025-05-22
  * @Version: V1.0
  */
+@Mapper
 public interface RegionRuleMapper extends BaseMapper<RegionRule> {
 
 }

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/RegionRule/mapper/xml/RegionRuleMapper.xml → lg-code/src/main/java/org/jeecg/modules/RegionRule/mapper/xml/RegionRuleMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.lg.mapper.RegionRuleMapper">
+<mapper namespace="org.jeecg.modules.RegionRule.mapper.RegionRuleMapper">
 
-</mapper>
+</mapper>

+ 2 - 2
lg-code/src/main/java/org.jeecg.lg/RegionRule/service/IRegionRuleService.java → lg-code/src/main/java/org/jeecg/modules/RegionRule/service/IRegionRuleService.java

@@ -1,7 +1,7 @@
-package org.jeecg.lg.RegionRule.service;
+package org.jeecg.modules.RegionRule.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.lg.RegionRule.entity.RegionRule;
+import org.jeecg.modules.RegionRule.entity.RegionRule;
 
 /**
  * @Description: 国别基准

+ 4 - 4
lg-code/src/main/java/org.jeecg.lg/RegionRule/service/impl/RegionRuleServiceImpl.java → lg-code/src/main/java/org/jeecg/modules/RegionRule/service/impl/RegionRuleServiceImpl.java

@@ -1,9 +1,9 @@
-package org.jeecg.lg.RegionRule.service.impl;
+package org.jeecg.modules.RegionRule.service.impl;
 
 
-import org.jeecg.lg.RegionRule.entity.RegionRule;
-import org.jeecg.lg.RegionRule.mapper.RegionRuleMapper;
-import org.jeecg.lg.RegionRule.service.IRegionRuleService;
+import org.jeecg.modules.RegionRule.entity.RegionRule;
+import org.jeecg.modules.RegionRule.mapper.RegionRuleMapper;
+import org.jeecg.modules.RegionRule.service.IRegionRuleService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 6 - 5
pom.xml

@@ -19,7 +19,7 @@
 		<developerConnection>http://guojusoft.com</developerConnection>
 		<url>http://www.jeecg.com/vip</url>
 	</scm>
-	
+
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-parent</artifactId>
@@ -49,7 +49,7 @@
         <hutool.version>5.8.25</hutool.version>
 		<!-- 国产数据库驱动 -->
 		<dm8.version>8.1.1.49</dm8.version>
-		
+
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
@@ -83,7 +83,8 @@
         <module>jeecg-boot-base-core</module>
         <module>jeecg-module-demo</module>
         <module>jeecg-module-system</module>
-    </modules>
+		<module>lg-code</module>
+	</modules>
 
 	<repositories>
 		<repository>
@@ -432,7 +433,7 @@
 				<artifactId>jeecg-boot-starter-chatgpt</artifactId>
                 <version>${jeecgboot.version}</version>
 			</dependency>
-            
+
 			<!--flyway 支持 mysql5.7+、MariaDB10.3.16-->
 			<!--mysql5.6,需要把版本号改成5.2.1-->
 			<dependency>
@@ -507,7 +508,7 @@
 			<url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
-	
+
     <!-- 环境 -->
     <profiles>
         <!-- 开发 -->