From dd57e7785687fa49096a2853589a02a29c37931d Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 23 四月 2024 08:59:34 +0800
Subject: [PATCH] 2024-04-23 印章后端

---
 cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java |    2 
 cnas-server/src/main/resources/mapper/DeviceMapper.xml                            |    1 
 cnas-server/src/main/resources/mapper/SealMapper.xml                              |   16 ++++
 cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java          |   52 +++++++++++++
 cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java          |    1 
 system-run/src/main/resources/application.yml                                     |    2 
 cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java            |    3 
 system-run/src/main/resources/application-prod.yml                                |    1 
 cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java            |    1 
 cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java                |   23 +++++
 cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java       |   50 ++++++++++++
 cnas-server/src/main/resources/mapper/LaboratoryMapper.xml                        |    1 
 cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java                          |   42 ++++++++++
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java        |    1 
 cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java                  |   13 +++
 cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java                    |    2 
 cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java    |   16 +++-
 17 files changed, 219 insertions(+), 8 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index d4ca573..315c89e 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -126,5 +126,6 @@
     public Result selectDeviceByCategory(String category) {
         return Result.success(deviceService.selectDeviceByCategory(category));
     }
+
 }
 
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index e508f55..d6ff7a8 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -1,28 +1,30 @@
 package com.yuanchu.mom.controller;
 
 
+import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.pojo.Laboratory;
 import com.yuanchu.mom.service.LaboratoryService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.Map;
 
 /**
  * 瀹為獙瀹ょ鐞�(LaboratoryController)琛ㄦ帶鍒跺眰
  */
 @Api(tags = "鍦烘墍鎴栬鏂�")
-@AllArgsConstructor
+
 @RestController
 @RequestMapping("/laboratoryScope")
 public class LaboratoryController {
+    @Value("${file.path}")
+    private String filePath;
+
 
     private LaboratoryService laboratoryService;
 
@@ -60,3 +62,9 @@
     }
 }
 
+
+
+
+
+
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
new file mode 100644
index 0000000..d406559
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -0,0 +1,52 @@
+package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Seal;
+import com.yuanchu.mom.service.SealService;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 鍗扮珷绠＄悊(SealController)琛ㄦ帶鍒跺眰
+ */
+@Api(tags = "鍗扮珷绠＄悊")
+
+@RestController
+@RequestMapping("/sealScope")
+public class SealController {
+
+    @Resource
+    private SealService sealService;
+
+    @ApiOperation(value = "鍒犻櫎鍗扮珷")
+    @PostMapping("/deleteSeal")
+    public Result deleteSeal(@RequestBody Integer id) {
+        return Result.success(sealService.delSeal(id));
+    }
+    @ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟")
+    @PostMapping("/addSeal")
+    public Result addSeal(@RequestBody Seal seal) {
+        return Result.success(sealService.addSeal(seal));
+    }
+    @ApiOperation(value = "淇敼鍗扮珷鍙傛暟")
+    @PostMapping("/upSeal")
+    public  Result upSeal(@RequestBody Seal seal){
+        return Result.success(sealService.upSeal(seal));
+    }
+    @ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
+    @PostMapping("/selectSeal")
+    public  Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
+        //鑾峰彇褰撳墠椤垫暟
+        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+        //鑾峰彇褰撳墠鍗扮珷淇℃伅
+        Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
+        //鑾峰彇鍒嗛〉鏁版嵁
+        return Result.success(sealService.selectSeal(page,seal));
+    }
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
index 833fb7f..f998d90 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
@@ -29,6 +29,7 @@
     //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
     IPage<UserDto> showUserById(@Param("page") IPage<UserDto> page, @Param("ids") List<String> ids, @Param("ew") QueryWrapper<UserDto> ew);
 
+
     //鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
     List<Integer> selectSonById(Integer id);
 }
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
index 3e5eb66..823569b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
@@ -6,6 +6,8 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.pojo.Laboratory;
 
+import java.util.Map;
+
 /**
  * 瀹為獙瀹ょ鐞�(Laboratory)琛ㄦ暟鎹簱璁块棶灞�
  */
@@ -14,5 +16,6 @@
     IPage<Laboratory> selectItemParameter(Page page, QueryWrapper<Laboratory> ew);
 
     Object obtainItemParameterList(Page page, QueryWrapper<Laboratory> queryWrappers);
+
 }
 
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
new file mode 100644
index 0000000..fd6f001
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Certification;
+
+import com.yuanchu.mom.pojo.Seal;
+
+public interface SealMapper extends BaseMapper<Seal> {
+    IPage<Seal> selectSeal(Page page, QueryWrapper<Seal> ew);
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
index 17e8058..ec07416 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
@@ -6,6 +6,7 @@
 import com.yuanchu.mom.common.OrderBy;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -15,6 +16,7 @@
  */
 @TableName(value = "laboratory")
 @Data
+@NoArgsConstructor
 public class Laboratory extends OrderBy implements Serializable {
     @ApiModelProperty(value = "涓婚敭")
     @TableId(type = IdType.AUTO)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
new file mode 100644
index 0000000..8154dec
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
@@ -0,0 +1,42 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鍗扮珷绠＄悊(Laboratory)琛ㄥ璞�
+ */
+
+@TableName(value = "seal")
+@Data
+public class Seal extends OrderBy implements Serializable {
+    @ApiModelProperty(value = "涓婚敭")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ValueTableShow(2)
+    @ApiModelProperty(value = "鍗扮珷鍦板潃")
+    private String address;
+
+    @ValueTableShow(3)
+    @ApiModelProperty(value = "鍗扮珷绫诲瀷")
+    private String type;
+    @ApiModelProperty(value = "鍒涘缓浜篿d")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @ValueTableShow(5)
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+}
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
index 2dcf3ed..7ec3f82 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
@@ -22,5 +22,6 @@
 
     List<Laboratory> obtainItemParameterList();
 
+
 }
 
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
new file mode 100644
index 0000000..fc4cd75
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
@@ -0,0 +1,23 @@
+package com.yuanchu.mom.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.Laboratory;
+import com.yuanchu.mom.pojo.Seal;
+
+import java.util.Map;
+
+public interface SealService extends IService<Seal> {
+
+    //鏂板
+    int addSeal(Seal seal);
+    //鍒犻櫎
+    int delSeal(int id);
+    //鏇存柊
+    int upSeal(Seal seal);
+    //鏌ヨ
+    Map<String, Object> selectSeal(Page page, Seal seal);
+
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
index d1c00d8..621fe7c 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
@@ -56,5 +56,7 @@
     public List<Laboratory> obtainItemParameterList() {
         return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
     }
+
+
 }
 
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
new file mode 100644
index 0000000..589a578
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
@@ -0,0 +1,50 @@
+package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.mapper.LaboratoryMapper;
+import com.yuanchu.mom.mapper.SealMapper;
+import com.yuanchu.mom.pojo.Certification;
+import com.yuanchu.mom.pojo.Laboratory;
+import com.yuanchu.mom.pojo.Seal;
+import com.yuanchu.mom.service.SealService;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class SealServiceImpl  extends ServiceImpl<SealMapper, Seal> implements SealService {
+    private SealMapper sealMapper;
+
+
+    @Override
+    public int addSeal(Seal seal) {
+        return sealMapper.insert(seal);
+    }
+
+    @Override
+    public int delSeal(int id) {
+        return sealMapper.deleteById(id);
+    }
+
+    @Override
+    public int upSeal(Seal seal) {
+        return sealMapper.updateById(seal);
+    }
+
+    @Override
+    public Map<String, Object> selectSeal(Page page, Seal seal) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("head", PrintChina.printChina(Seal.class));
+        map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));
+        System.out.println(page);
+        return map;
+    }
+
+
+}
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 7f8d103..f24ba1a 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -80,7 +80,6 @@
     </select>
 
     <update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device">
-
         UPDATE device
         <set>
             <if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if>
diff --git a/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml b/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
index e750909..bba2d21 100644
--- a/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
+++ b/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
@@ -4,7 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.mom.mapper.LaboratoryMapper">
 
-
     <select id="selectItemParameter" resultType="com.yuanchu.mom.pojo.Laboratory">
         select * from
         (
diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
new file mode 100644
index 0000000..0ae0d6e
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -0,0 +1,16 @@
+<?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="com.yuanchu.mom.mapper.SealMapper">
+    <select id="selectSeal" resultType="com.yuanchu.mom.mapper.SealMapper">
+        select s.address,s.type,u.`name`,s.create_time
+        from seal s
+            LEFT JOIN `user` u
+                on s.create_user=u.id
+        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+            ${ew.customSqlSegment}
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/system-run/src/main/resources/application-prod.yml b/system-run/src/main/resources/application-prod.yml
index bb8421b..a911969 100644
--- a/system-run/src/main/resources/application-prod.yml
+++ b/system-run/src/main/resources/application-prod.yml
@@ -55,7 +55,6 @@
       useGlobalDataSourceStat: true #鍚堝苟澶氫釜DruidDatasource鐨勭洃鎺ф暟鎹�
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500; #閫氳繃connectProperties灞炴�ф潵鎵撳紑mergesql鍔熻兘缃楁參sQL璁板綍
 
-
 redis:
   # redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
   database: 0
diff --git a/system-run/src/main/resources/application.yml b/system-run/src/main/resources/application.yml
index 648b09f..cfbe348 100644
--- a/system-run/src/main/resources/application.yml
+++ b/system-run/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8001
+  port: 8002
 spring:
   profiles:
     active: dev

--
Gitblit v1.9.3