cxd 6 месяцев назад
Родитель
Сommit
87fd8b811a

+ 5 - 4
gqy-admin/src/main/java/com/gqy/web/controller/document/DcSpecController.java

@@ -12,6 +12,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 产品规格Controller
@@ -29,7 +30,7 @@ public class DcSpecController  extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(DcSpec dcSpec) {
         startPage();
-        List<DcSpec> list =  null;
+        List<DcSpec> list =  iDcSpecService.selectDcSpecList(dcSpec);
         return getDataTable(list);
     }
 
@@ -47,7 +48,7 @@ public class DcSpecController  extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('system:spec:add')")
 //    @Log(title = "产品规格", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody DcSpec dcSpec) {
         return toAjax(iDcSpecService.insertDcSpec(dcSpec));
     }
@@ -57,8 +58,8 @@ public class DcSpecController  extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('system:spec:edit')")
 //    @Log(title = "产品规格", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DcSpec dcSpec) {
+    @PostMapping("/update")
+    public AjaxResult update(@RequestBody DcSpec dcSpec) {
         return toAjax(iDcSpecService.updateDcSpec(dcSpec));
     }
 

+ 46 - 8
gqy-admin/src/main/java/com/gqy/web/controller/document/DcSystemController.java

@@ -3,28 +3,66 @@ package com.gqy.web.controller.document;
 import com.gqy.common.annotation.Log;
 import com.gqy.common.core.controller.BaseController;
 import com.gqy.common.core.domain.AjaxResult;
+import com.gqy.common.core.page.TableDataInfo;
 import com.gqy.common.enums.BusinessType;
+import com.gqy.document.domain.DcSystem;
+import com.gqy.document.domain.DcWork;
+import com.gqy.document.service.IDcSystemService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 
+/**
+ * 系统工程类
+ */
 @RestController
 @RequestMapping("/dcsystem")
 public class DcSystemController extends BaseController {
 
+
+    @Autowired
+    private IDcSystemService iDcSystemService;
+
     /**
      * 创建系统信息
      */
-    @PostMapping("/create")
-    public AjaxResult create() {
-        //return documentService.create(request, file);
-        return  null;
+    @PostMapping("/add")
+    public @ResponseBody AjaxResult add(@RequestBody DcSystem dcSystem) {
+        return iDcSystemService.insertDcSystem(dcSystem);
+    }
+
+    /**
+     * 更新系统信息
+     */
+    @PostMapping("/update")
+    public @ResponseBody AjaxResult update(@RequestBody DcSystem dcSystem) {
+        return iDcSystemService.updateDcSystem(dcSystem);
+    }
+
+
+    /**
+     * 查询列表信息
+     * @return
+     */
+    @GetMapping("/list")
+    // Bug 修复:删除未使用的参数,使用推荐的类型安全的 Map 替代原始类型 Map
+    public TableDataInfo list(String sysNo) {
+
+        DcSystem dcSystem = new DcSystem();
+        dcSystem.setSysNo(sysNo);
+
+        // 开启分页
+        startPage();
+        // 获取工程列表
+        List<DcSystem> list = iDcSystemService.selectDcSystemList(dcSystem);
+        // 返回分页数据
+        return getDataTable(list);
     }
 
 

+ 2 - 2
gqy-admin/src/main/java/com/gqy/web/core/config/SwaggerConfig.java

@@ -24,7 +24,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 
 /**
  * Swagger2的接口配置
- * 
+ *
  * @author raycos
  */
 @Configuration
@@ -113,7 +113,7 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题:若依管理系统_接口文档")
+                .title("标题:管理系统_接口文档")
                 // 描述
                 .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息

+ 5 - 1
gqy-admin/src/main/resources/application-druid.yml

@@ -7,11 +7,15 @@ spring:
             # 主库数据源
             master:
 #                url: jdbc:mysql://120.46.190.49:3306/rouyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://60.204.236.53:3306/gqynew?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #username: root
+                #password: TZPpsyFWLSMTzzFE
+                #password: Gd8XCWEef72GerxE
 
                 url: jdbc:mysql://localhost:3306/rouyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: root
-                #password: Gd8XCWEef72GerxE
+
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 11 - 3
gqy-common/pom.xml

@@ -52,19 +52,27 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-  
+
         <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        
+
         <!-- 阿里JSON解析器 -->
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
         </dependency>
 
+        <!-- FastJson2 Spring 扩展依赖 -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2-extension-spring5</artifactId>
+            <version>2.0.53</version>
+        </dependency>
+
+
         <!-- io常用工具类 -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -121,4 +129,4 @@
 
     </dependencies>
 
-</project>
+</project>

+ 8 - 7
gqy-common/src/main/java/com/gqy/common/utils/SecurityUtils.java

@@ -15,7 +15,7 @@ import com.gqy.common.exception.ServiceException;
 
 /**
  * 安全服务工具类
- * 
+ *
  * @author raycos
  */
 public class SecurityUtils
@@ -77,7 +77,8 @@ public class SecurityUtils
         }
         catch (Exception e)
         {
-            throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
+            e.printStackTrace();
+            throw new ServiceException("77777====获取用户信息异常", HttpStatus.UNAUTHORIZED);
         }
     }
 
@@ -116,7 +117,7 @@ public class SecurityUtils
 
     /**
      * 是否为管理员
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -127,7 +128,7 @@ public class SecurityUtils
 
     /**
      * 验证用户是否具备某权限
-     * 
+     *
      * @param permission 权限字符串
      * @return 用户是否具备某权限
      */
@@ -138,7 +139,7 @@ public class SecurityUtils
 
     /**
      * 判断是否包含权限
-     * 
+     *
      * @param authorities 权限列表
      * @param permission 权限字符串
      * @return 用户是否具备某权限
@@ -151,7 +152,7 @@ public class SecurityUtils
 
     /**
      * 验证用户是否拥有某个角色
-     * 
+     *
      * @param role 角色标识
      * @return 用户是否具备某角色
      */
@@ -164,7 +165,7 @@ public class SecurityUtils
 
     /**
      * 判断是否包含角色
-     * 
+     *
      * @param roles 角色列表
      * @param role 角色
      * @return 用户是否具备某角色权限

+ 10 - 14
gqy-common/src/main/java/com/gqy/common/utils/html/EscapeUtil.java

@@ -4,7 +4,7 @@ import com.gqy.common.utils.StringUtils;
 
 /**
  * 转义和反转义工具类
- * 
+ *
  * @author raycos
  */
 public class EscapeUtil
@@ -30,7 +30,7 @@ public class EscapeUtil
 
     /**
      * 转义文本中的HTML字符为安全的字符
-     * 
+     *
      * @param text 被转义的文本
      * @return 转义后的文本
      */
@@ -41,7 +41,7 @@ public class EscapeUtil
 
     /**
      * 还原被转义的HTML特殊字符
-     * 
+     *
      * @param content 包含转义符的HTML内容
      * @return 转换后的字符串
      */
@@ -52,7 +52,7 @@ public class EscapeUtil
 
     /**
      * 清除所有HTML标签,但是不删除标签内的内容
-     * 
+     *
      * @param content 文本
      * @return 清除标签后的文本
      */
@@ -63,7 +63,7 @@ public class EscapeUtil
 
     /**
      * Escape编码
-     * 
+     *
      * @param text 被编码的文本
      * @return 编码后的字符
      */
@@ -104,7 +104,7 @@ public class EscapeUtil
 
     /**
      * Escape解码
-     * 
+     *
      * @param content 被转义的内容
      * @return 解码后的字符串
      */
@@ -155,13 +155,9 @@ public class EscapeUtil
 
     public static void main(String[] args)
     {
-        String html = "<script>alert(1);</script>";
-        String escape = EscapeUtil.escape(html);
-        // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
-        // String html = "<123";
-        // String html = "123>";
-        System.out.println("clean: " + EscapeUtil.clean(html));
-        System.out.println("escape: " + escape);
-        System.out.println("unescape: " + EscapeUtil.unescape(escape));
+        int a =-1;
+        int b = -1;
+        int c = b+a;
+        System.out.println("=========c="+c);
     }
 }

+ 2 - 1
gqy-framework/pom.xml

@@ -23,6 +23,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+
         <!-- SpringBoot 拦截器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -61,4 +62,4 @@
 
     </dependencies>
 
-</project>
+</project>

+ 56 - 24
gqy-framework/src/main/java/com/gqy/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,52 +1,84 @@
 package com.gqy.framework.config;
 
-import java.nio.charset.Charset;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONFactory;
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
-import com.alibaba.fastjson2.filter.Filter;
-import com.gqy.common.constant.Constants;
+import com.alibaba.fastjson2.reader.ObjectReaderProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+import java.nio.charset.StandardCharsets;
+
 
 /**
  * Redis使用FastJson序列化
- * 
+ *
  * @author raycos
  */
-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
-{
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
-    static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR);
 
+public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
+//    private static final Logger log = LoggerFactory.getLogger(FastJson2JsonRedisSerializer.class);
     private Class<T> clazz;
 
-    public FastJson2JsonRedisSerializer(Class<T> clazz)
-    {
+    public FastJson2JsonRedisSerializer(Class<T> clazz) {
         super();
         this.clazz = clazz;
     }
 
     @Override
-    public byte[] serialize(T t) throws SerializationException
-    {
-        if (t == null)
-        {
+    public byte[] serialize(T t) throws SerializationException {
+        if (t == null) {
             return new byte[0];
         }
-        return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET);
+        try {
+            return JSON.toJSONBytes(t,
+                    JSONWriter.Feature.WriteClassName,
+                    JSONWriter.Feature.FieldBased,
+                    JSONWriter.Feature.WriteMapNullValue,
+                    JSONWriter.Feature.WriteNulls
+            );
+        } catch (Exception ex) {
+            throw new SerializationException("Could not serialize: " + ex.getMessage(), ex);
+        }
     }
 
     @Override
-    public T deserialize(byte[] bytes) throws SerializationException
-    {
-        if (bytes == null || bytes.length <= 0)
-        {
+    public T deserialize(byte[] bytes) throws SerializationException {
+        if (bytes == null || bytes.length <= 0) {
             return null;
         }
-        String str = new String(bytes, DEFAULT_CHARSET);
 
-        return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER);
+        try {
+            // 获取当前线程的类加载器
+            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+
+            // 创建 ObjectReaderProvider
+            ObjectReaderProvider provider = new ObjectReaderProvider();
+            provider.addAutoTypeAccept("com.gqy.*");
+
+            // 创建 JSONReader 并配置
+            String jsonString = new String(bytes, StandardCharsets.UTF_8);
+            JSONReader jsonReader = JSONReader.of(jsonString);
+
+            // 配置 Context
+            JSONReader.Context context = JSONFactory.createReadContext(provider);
+            context.config(
+                    JSONReader.Feature.SupportAutoType,
+                    JSONReader.Feature.FieldBased,
+                    JSONReader.Feature.UseNativeObject
+            );
+
+            // 使用配置好的 context 创建新的 JSONReader
+            jsonReader = JSONReader.of(jsonString, context);
+
+            // 执行反序列化
+            return jsonReader.read(clazz);
+
+        } catch (Exception ex) {
+            throw new SerializationException("Could not deserialize: " + ex.getMessage(), ex);
+        }
     }
 }

+ 18 - 6
gqy-framework/src/main/java/com/gqy/framework/config/RedisConfig.java

@@ -1,5 +1,8 @@
 package com.gqy.framework.config;
 
+import javax.annotation.PostConstruct;
+
+import com.alibaba.fastjson2.JSONFactory;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
@@ -9,9 +12,12 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONReader;
+
 /**
  * redis配置
- * 
+ *
  * @author raycos
  */
 @Configuration
@@ -25,17 +31,16 @@ public class RedisConfig extends CachingConfigurerSupport
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
 
-        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+        // 1. 创建JSON序列化器
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
 
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
+        // 2. 配置RedisTemplate
         template.setKeySerializer(new StringRedisSerializer());
         template.setValueSerializer(serializer);
-
-        // Hash的key也采用StringRedisSerializer的序列化方式
         template.setHashKeySerializer(new StringRedisSerializer());
         template.setHashValueSerializer(serializer);
-
         template.afterPropertiesSet();
+
         return template;
     }
 
@@ -48,6 +53,13 @@ public class RedisConfig extends CachingConfigurerSupport
         return redisScript;
     }
 
+
+    @PostConstruct
+    public void init() {
+        JSONFactory.getDefaultObjectReaderProvider().addAutoTypeAccept("com.gqy.");
+
+    }
+
     /**
      * 限流脚本
      */

+ 2 - 1
gqy-framework/src/main/java/com/gqy/framework/web/service/TokenService.java

@@ -76,7 +76,8 @@ public class TokenService
             }
             catch (Exception e)
             {
-                log.error("获取用户信息异常'{}'", e.getMessage());
+                e.printStackTrace();
+                log.error("getLoginUser=====获取用户信息异常'{}'", e.getMessage());
             }
         }
         return null;

+ 36 - 25
gqy-system/src/main/java/com/gqy/document/domain/DcSystem.java

@@ -9,61 +9,72 @@ import com.gqy.common.core.domain.BaseEntity;
 public class DcSystem extends BaseEntity {
 
     @Excel(name = "系统id")
-    private Long sys_id;
+    private Long sysId;
+
+    /** 系统类别编号 */
+    private String sysNo;
 
     /** 系统名称 */
     @Excel(name = "系统名称")
-    private String sys_name;
+    private String sysName;
 
     /** 系统备注 */
     @Excel(name = "系统备注")
-    private String sys_remark;
+    private String sysRemark;
 
     /** 产品级 */
     @Excel(name = "产品级")
-    private String sys_products;
+    private String sysProducts;
 
     /** 用户id */
     @Excel(name = "用户id")
-    private Long user_id;
+    private Long userId;
+
+    public String getSysNo() {
+        return sysNo;
+    }
+
+    public void setSysNo(String sysNo) {
+        this.sysNo = sysNo;
+    }
 
-    public Long getSys_id() {
-        return sys_id;
+    public Long getSysId() {
+        return sysId;
     }
 
-    public void setSys_id(Long sys_id) {
-        this.sys_id = sys_id;
+    public void setSysId(Long sysId) {
+        this.sysId = sysId;
     }
 
-    public String getSys_name() {
-        return sys_name;
+    public String getSysName() {
+        return sysName;
     }
 
-    public void setSys_name(String sys_name) {
-        this.sys_name = sys_name;
+    public void setSysName(String sysName) {
+        this.sysName = sysName;
     }
 
-    public String getSys_remark() {
-        return sys_remark;
+    public String getSysRemark() {
+        return sysRemark;
     }
 
-    public void setSys_remark(String sys_remark) {
-        this.sys_remark = sys_remark;
+    public void setSysRemark(String sysRemark) {
+        this.sysRemark = sysRemark;
     }
 
-    public String getSys_products() {
-        return sys_products;
+    public String getSysProducts() {
+        return sysProducts;
     }
 
-    public void setSys_products(String sys_products) {
-        this.sys_products = sys_products;
+    public void setSysProducts(String sysProducts) {
+        this.sysProducts = sysProducts;
     }
 
-    public Long getUser_id() {
-        return user_id;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setUser_id(Long user_id) {
-        this.user_id = user_id;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 }

+ 17 - 0
gqy-system/src/main/java/com/gqy/document/mapper/DcSystemMapper.java

@@ -2,6 +2,8 @@ package com.gqy.document.mapper;
 
 import com.gqy.document.domain.DcSystem;
 
+import java.util.List;
+
 /**
  * 系统信息Mapper
  */
@@ -12,4 +14,19 @@ public interface DcSystemMapper {
      */
     public int insertDcSystem(DcSystem dcSystem);
 
+    /**
+     * 查询列表信息
+     * @param dcSystem
+     * @return
+     */
+    public List<DcSystem> selectDcSystemList(DcSystem dcSystem);
+
+
+    /**
+     * 更新
+     * @param dcSystem
+     * @return
+     */
+    public int updateDcSystem(DcSystem dcSystem);
+
 }

+ 15 - 0
gqy-system/src/main/java/com/gqy/document/service/IDcSystemService.java

@@ -3,6 +3,8 @@ package com.gqy.document.service;
 import com.gqy.common.core.domain.AjaxResult;
 import com.gqy.document.domain.DcSystem;
 
+import java.util.List;
+
 /**
  *
  */
@@ -13,5 +15,18 @@ public interface IDcSystemService {
      */
     public AjaxResult insertDcSystem(DcSystem dcSystem);
 
+    /**
+     * 查询
+     * @param dcSystem
+     * @return
+     */
+    public List<DcSystem> selectDcSystemList(DcSystem dcSystem);
+
+
+    /**
+     * 新增系统配置
+     */
+    public AjaxResult updateDcSystem(DcSystem dcSystem);
+
 
 }

+ 12 - 0
gqy-system/src/main/java/com/gqy/document/service/impl/DcSpecServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gqy.document.service.impl;
 
+import com.gqy.common.annotation.Log;
 import com.gqy.document.domain.DcSpec;
 import com.gqy.document.mapper.DcSpecMapper;
 import com.gqy.document.service.IDcSpecService;
@@ -7,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 产品规格Service业务层处理
@@ -33,10 +35,20 @@ public class DcSpecServiceImpl implements IDcSpecService {
         return dcSpecMapper.selectDcSpecList(dcSpec);
     }
 
+    /**
+     * 保存规格信息
+     * @param dcSpec
+     * @return
+     */
     public int insertDcSpec(DcSpec dcSpec) {
         return dcSpecMapper.insertDcSpec(dcSpec);
     }
 
+    @Override
+    public int insertDcSpec(Map maps) {
+        return 0;
+    }
+
     public int updateDcSpec(DcSpec dcSpec) {
         return dcSpecMapper.updateDcSpec(dcSpec);
     }

+ 32 - 0
gqy-system/src/main/java/com/gqy/document/service/impl/DcSystemServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gqy.document.service.impl;
 
 import com.gqy.common.core.domain.AjaxResult;
+import com.gqy.common.utils.SecurityUtils;
 import com.gqy.document.domain.DcSystem;
 import com.gqy.document.mapper.DcSystemMapper;
 import com.gqy.document.service.IDcSystemService;
@@ -9,6 +10,8 @@ import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 @Service
 public class DcSystemServiceImpl implements IDcSystemService {
 
@@ -22,6 +25,7 @@ public class DcSystemServiceImpl implements IDcSystemService {
      */
     public AjaxResult insertDcSystem(DcSystem dcSystem) {
         try{
+          //  dcSystem.setUserId(SecurityUtils.getUserId());
             dcSystemMapper.insertDcSystem(dcSystem);
         }catch (Exception e){
             log.info("error===insertDcSystem",e);
@@ -29,4 +33,32 @@ public class DcSystemServiceImpl implements IDcSystemService {
         }
         return AjaxResult.success("新增系统配置成功");
     }
+
+    /**
+     * 新增系统配置
+     */
+    public AjaxResult updateDcSystem(DcSystem dcSystem) {
+        try{
+            //  dcSystem.setUserId(SecurityUtils.getUserId());
+            dcSystemMapper.updateDcSystem(dcSystem);
+        }catch (Exception e){
+            log.info("error===updateDcSystem",e);
+            return AjaxResult.error("系统异常");
+        }
+        return AjaxResult.success("新增系统配置成功");
+    }
+
+
+
+
+    /**
+     * 查询列表信息
+     * @param dcSystem
+     * @return
+     */
+    public List<DcSystem> selectDcSystemList(DcSystem dcSystem) {
+        return  dcSystemMapper.selectDcSystemList(dcSystem);
+    }
+
+
 }

+ 29 - 27
gqy-system/src/main/resources/mapper/document/DcSystemMapper.xml

@@ -3,26 +3,26 @@
 <mapper namespace="com.gqy.document.mapper.DcSystemMapper">
 
     <resultMap type="DcSystem" id="DcSystemResult">
-        <id     property="sys_id"      column="sys_id"      />
-        <result property="sys_name"    column="sys_name"    />
-        <result property="sys_remark"  column="sys_remark"  />
-        <result property="sys_products"  column="sys_products"  />
-        <result property="user_id"  column="user_id"  />
+        <id     property="sysId"      column="sys_id"      />
+        <result property="sysName"    column="sys_name"    />
+        <result property="sysNo"    column="sys_no"    />
+        <result property="sysRemark"  column="sys_remark"  />
+        <result property="sysProducts"  column="sys_products"  />
     </resultMap>
 
     <sql id="selectDcSystemVo">
-        select sys_id, sys_name, sys_remark, sys_products, user_id
+        select sys_id, sys_name, sys_no, sys_remark, sys_products
         from dc_system
     </sql>
 
     <select id="selectDcSystemList" parameterType="DcSystem" resultMap="DcSystemResult">
         <include refid="selectDcSystemVo"/>
         <where>
-            <if test="sys_name != null and sys_name != ''">
-                AND sys_name like concat('%', #{sys_name}, '%')
+            <if test="sysName != null and sysName != ''">
+                AND sys_name like concat('%', #{sysName}, '%')
             </if>
-            <if test="user_id != null">
-                AND user_id = #{user_id}
+            <if test="sysNo != null and sysNo != ''">
+                AND sys_no = #{sysNo}
             </if>
         </where>
     </select>
@@ -32,29 +32,31 @@
         where sys_id = #{sys_id}
     </select>
 
-    <insert id="insertDcSystem" parameterType="DcSystem" useGeneratedKeys="true" keyProperty="sys_id">
-        insert into dc_system (
-        <if test="sys_name != null">sys_name,</if>
-        <if test="sys_remark != null">sys_remark,</if>
-        <if test="sys_products != null">sys_products,</if>
-        <if test="user_id != null">user_id</if>
-        )values(
-        <if test="sys_name != null">#{sys_name},</if>
-        <if test="sys_remark != null">#{sys_remark},</if>
-        <if test="sys_products != null">#{sys_products},</if>
-        <if test="user_id != null">#{user_id}</if>
-        )
+    <insert id="insertDcSystem" parameterType="DcSystem" useGeneratedKeys="true" keyProperty="sysId">
+        insert into dc_system
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="sysName != null">sys_name,</if>
+                <if test="sysNo != null">sys_no,</if>
+                <if test="sysRemark != null">sys_remark,</if>
+                <if test="sysProducts != null">sys_products</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sysName != null">#{sysName},</if>
+            <if test="sysNo != null">#{sysNo},</if>
+            <if test="sysRemark != null">#{sysRemark},</if>
+            <if test="sysProducts != null">#{sysProducts}</if>
+        </trim>
     </insert>
 
     <update id="updateDcSystem" parameterType="DcSystem">
         update dc_system
         <set>
-            <if test="sys_name != null">sys_name = #{sys_name},</if>
-            <if test="sys_remark != null">sys_remark = #{sys_remark},</if>
-            <if test="sys_products != null">sys_products = #{sys_products},</if>
-            <if test="user_id != null">user_id = #{user_id},</if>
+            <if test="sysName != null">sys_name = #{sysName},</if>
+            <if test="sysNo != null">sys_no = #{sysNo},</if>
+            <if test="sysRemark != null">sys_remark = #{sysRemark},</if>
+            <if test="sysProducts != null">sys_products = #{sysProducts}</if>
         </set>
-        where sys_id = #{sys_id}
+        where sys_id = #{sysId}
     </update>
 
     <delete id="deleteDcSystemById" parameterType="Long">

+ 1 - 1
read.txt

@@ -1,2 +1,2 @@
 sudo apt-get update
-sudo apt-get install pandoc
+必须 安装 sudo apt-get install pandoc

+ 13 - 0
创建表语句.txt

@@ -341,3 +341,16 @@ CREATE TABLE `dc_work` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`wk_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='工程表';
+
+drop table dc_system;
+
+CREATE TABLE `dc_system` (
+  `sys_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '系统id',
+  `sys_name` varchar(100) NOT NULL COMMENT '系统名称',
+	`sys_code` varchar(100) NOT NULL COMMENT '系统编号',
+  `sys_remark` varchar(500) DEFAULT NULL COMMENT '系统备注',
+  `sys_products` int(11) DEFAULT '0' COMMENT '产品数',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`sys_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统表';