From 189581056dd27d336d0eede2558944c4ea0b8464 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Wed, 13 Mar 2024 16:49:02 +0800
Subject: [PATCH] xn

---
 .../com/dsic/gj_erp/bean/jcsj/EmSbjbb.java    |  3 +
 .../com/dsic/gj_erp/bean/jcsj/EmSbjgry.java   | 54 ++++++++++++++
 .../dsic/gj_erp/controller/ApiController.java | 10 +++
 .../controller/jcsj/EmSbjgryController.java   | 74 +++++++++++++++++++
 .../com/dsic/gj_erp/mapper/SyuserMapper.java  |  3 +
 .../gj_erp/mapper/jcsj/EmSbcnpMapper.java     |  2 +-
 .../gj_erp/mapper/jcsj/EmSbjgryMapper.java    | 18 +++++
 .../com/dsic/gj_erp/service/ApiService.java   |  8 ++
 .../gj_erp/service/jcsj/EmSbjgryService.java  | 22 ++++++
 .../jcsj/impl/EmSbjgryServiceImpl.java        | 33 +++++++++
 .../com/dsic/gj_erp/service/sy/SYService.java |  3 +
 .../resources/mappers/jcsj/EmSbcnpMapper.xml  |  7 +-
 .../resources/mappers/jcsj/EmSbjgryMapper.xml |  7 ++
 .../resources/mappers/sy/SyuserMapper.xml     | 14 ++--
 14 files changed, 246 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java
 create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java
 create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java
 create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java
 create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java
 create mode 100644 src/main/resources/mappers/jcsj/EmSbjgryMapper.xml

diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java
index 0439c5d..501ab75 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java
@@ -295,5 +295,8 @@ public class EmSbjbb implements Serializable {
     @TableField("TSKSRQ")
     private String tsksrq;
 
+    private String sbyxzt;
+    private String whsj;
+
 
 }
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java
new file mode 100644
index 0000000..62fad3e
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java
@@ -0,0 +1,54 @@
+package com.dsic.gj_erp.bean.jcsj;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xn
+ * @since 2024-03-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="EmSbjgry对象")
+public class EmSbjgry implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    @ApiModelProperty(value = "登录账号")
+    private String dlzh;
+
+    @ApiModelProperty(value = "职号")
+    private String employeeNumber;
+
+    @ApiModelProperty(value = "所属工序")
+    private String gx;
+
+    @ApiModelProperty(value = "休假时间范围")
+    private String xjsj;
+
+    @ApiModelProperty(value = "默认设备")
+    private String sb;
+
+    @ApiModelProperty(value = "状态；0在职1离职")
+    private String zt;
+
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/controller/ApiController.java b/src/main/java/com/dsic/gj_erp/controller/ApiController.java
index 44d2e62..d2eda7c 100644
--- a/src/main/java/com/dsic/gj_erp/controller/ApiController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/ApiController.java
@@ -8,6 +8,7 @@ import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.SyuserMapper;
 import com.dsic.gj_erp.service.ApiService;
 import com.dsic.gj_erp.service.sy.SYService;
+import com.dsic.gj_erp.util.MD5Util;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -56,6 +57,15 @@ public class ApiController {
         return new ResultBean(map);
     }
 
+    @AuthFunction
+    @RequestMapping(value = "/updatePassword")
+    public ResultBean updatePassword(@RequestBody Map<String, Object> paramMap,HttpServletRequest request) {
+        String yhdm = (String) request.getAttribute("yhdm");
+        String newPWD= (String) paramMap.get("confirmpwd");
+        apiService.updatePassword(yhdm, MD5Util.encrypt(newPWD));
+        return new ResultBean();
+    }
+
 
 
 }
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java
new file mode 100644
index 0000000..529ea36
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java
@@ -0,0 +1,74 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
+import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
+import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@RestController
+@RequestMapping("/emSbjgry")
+@Api(tags = "设备加工人员")
+public class EmSbjgryController {
+    @Autowired
+    EmSbjgryService emSbjgryService;
+
+    @ApiOperation(value = "查询")
+    @PostMapping(value = "/getList")
+    public ResultBean getList(@RequestBody EmSbjgry ry) {
+        List<EmSbjgry> emSbjgryList= emSbjgryService.list(new QueryWrapper<EmSbjgry>().eq("gx",ry.getGx()));
+        return new ResultBean(emSbjgryList);
+    }
+
+    @ApiOperation(value = "批量新增")
+    @PostMapping(value = "/save")
+    @AuthFunction
+    public ResultBean save(@RequestBody List<EmSbjgry> emSbjgryList, HttpServletRequest req) {
+        String username=(String) req.getAttribute("yhms");
+        emSbjgryService.saveBatch(emSbjgryList);
+
+        return new ResultBean();
+    }
+
+    @ApiOperation(value = "批量修改")
+    @PostMapping(value = "/update")
+    @AuthFunction
+    public ResultBean update(@RequestBody List<EmSbjgry> emSbjgryList, HttpServletRequest req) {
+        String username=(String) req.getAttribute("yhms");
+        emSbjgryService.updateBatchById(emSbjgryList);
+
+        return new ResultBean();
+    }
+
+    @ApiOperation(value = "批量删除")
+    @PostMapping(value = "/delete")
+    public ResultBean delete(@RequestBody List<EmSbjgry> emSbjgryList) {
+        emSbjgryService.removeByIds(emSbjgryList);
+
+        return new ResultBean();
+    }
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/mapper/SyuserMapper.java b/src/main/java/com/dsic/gj_erp/mapper/SyuserMapper.java
index ad0c8f8..7665d03 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/SyuserMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/SyuserMapper.java
@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.mapper;
 
 import com.dsic.gj_erp.bean.sy.Syuserp;
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -59,4 +60,6 @@ public interface SyuserMapper {
     void addRoleForMenu(Map<String, Object> menu_role);
 
     void deleteRoleForMenu(Map<String, Object> menu_role);
+
+    Integer updatePassword(@Param("yhdm") String yhdm,@Param("newPWD") String newPWD);
 }
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbcnpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbcnpMapper.java
index b4bc9bc..d32eb72 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbcnpMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbcnpMapper.java
@@ -13,5 +13,5 @@ import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
  * @since 2023-09-15
  */
 public interface EmSbcnpMapper extends BaseMapper<EmSbcnp> {
-    int test();
+
 }
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java
new file mode 100644
index 0000000..d5d70d3
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java
@@ -0,0 +1,18 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+public interface EmSbjgryMapper extends BaseMapper<EmSbjgry> {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/ApiService.java b/src/main/java/com/dsic/gj_erp/service/ApiService.java
index fa7dfe9..0e9d1d4 100644
--- a/src/main/java/com/dsic/gj_erp/service/ApiService.java
+++ b/src/main/java/com/dsic/gj_erp/service/ApiService.java
@@ -7,6 +7,7 @@ import com.dsic.gj_erp.bean.sy.QSyuirp;
 import com.dsic.gj_erp.bean.sy.Syuserp;
 import com.dsic.gj_erp.dao.sy.SyuserpRepository;
 import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.mapper.SyuserMapper;
 import com.dsic.gj_erp.util.JwtUtil;
 import com.dsic.gj_erp.util.MD5Util;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -30,6 +31,9 @@ public class ApiService {
     @Autowired
     private EntityManager entityManager;
 
+    @Autowired
+    private SyuserMapper syuserMapper;
+
     private JPAQueryFactory queryFactory;
 
     @PostConstruct
@@ -74,6 +78,10 @@ public class ApiService {
         return dataMap;
     }
 
+    public Integer updatePassword(String yhdm,String newPWD) {
+        return syuserMapper.updatePassword(yhdm,newPWD);
+    }
+
     public boolean hasPermission(String yhdm, String[] ckdm) {
         if (ckdm == null || ckdm.length == 0) {
             return true;
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java
new file mode 100644
index 0000000..eaccced
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java
@@ -0,0 +1,22 @@
+package com.dsic.gj_erp.service.jcsj;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+public interface EmSbjgryService extends IService<EmSbjgry> {
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java
new file mode 100644
index 0000000..cb87b18
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java
@@ -0,0 +1,33 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
+import com.dsic.gj_erp.mapper.jcsj.EmSbcnpMapper;
+import com.dsic.gj_erp.mapper.jcsj.EmSbjgryMapper;
+import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
+import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@Service
+public class EmSbjgryServiceImpl extends ServiceImpl<EmSbjgryMapper, EmSbjgry> implements EmSbjgryService {
+
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
index d3a58fc..f7c36c3 100644
--- a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
+++ b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dsic.gj_erp.bean.sy.*;
 import com.dsic.gj_erp.dao.sy.*;
 import com.dsic.gj_erp.mapper.SyuserMapper;
+import com.dsic.gj_erp.util.MD5Util;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -275,6 +276,8 @@ public class SYService {
     }
 
     public Syuserp addUser(Syuserp syuserp) {
+//        syuserp.setPWD(MD5Util.encrypt(syuserp.getPWD()));
+        syuserp.setPWD("");
         return syuserpRepository.save(syuserp);
     }
 
diff --git a/src/main/resources/mappers/jcsj/EmSbcnpMapper.xml b/src/main/resources/mappers/jcsj/EmSbcnpMapper.xml
index 55c9e29..5403089 100644
--- a/src/main/resources/mappers/jcsj/EmSbcnpMapper.xml
+++ b/src/main/resources/mappers/jcsj/EmSbcnpMapper.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsic.gj_erp.mapper.jcsj.EmSbcnpMapper">
 
-    <!-- 通用查询映射结果 -->
-<insert id="test">
-    INSERT into em_sbcnp(id) VALUES(
-                                       REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','')
-                                   )
-</insert>
+
 
 </mapper>
diff --git a/src/main/resources/mappers/jcsj/EmSbjgryMapper.xml b/src/main/resources/mappers/jcsj/EmSbjgryMapper.xml
new file mode 100644
index 0000000..92a81ad
--- /dev/null
+++ b/src/main/resources/mappers/jcsj/EmSbjgryMapper.xml
@@ -0,0 +1,7 @@
+<?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.dsic.gj_erp.mapper.jcsj.EmSbjgryMapper">
+
+
+
+</mapper>
diff --git a/src/main/resources/mappers/sy/SyuserMapper.xml b/src/main/resources/mappers/sy/SyuserMapper.xml
index 03353bb..7f942a5 100644
--- a/src/main/resources/mappers/sy/SyuserMapper.xml
+++ b/src/main/resources/mappers/sy/SyuserMapper.xml
@@ -59,8 +59,8 @@
             syfunp.zxtbm as system_code,
             syfunp.ylzd1 as menu_name,
             null as gnlb
-        FROM syifrp join syfunp on (syifrp.zxtbm = syfunp.zxtbm and syifrp.ms = syfunp.ms)
-        WHERE syifrp.zxtbm='PS'
+        FROM syfunp
+        WHERE syfunp.zxtbm='PS'
 
         UNION ALL
 
@@ -68,8 +68,8 @@
             right(syfunp.ylzd2,2) as parent_id,
             syfunp.zxtbm as system_code,
             syfunp.ms as menu_name, syfunp.gnlb
-        FROM syifrp  join syfunp on (syifrp.zxtbm = syfunp.zxtbm and syifrp.ms = syfunp.ms)
-        WHERE syifrp.zxtbm='PS'
+        FROM syfunp
+        WHERE syfunp.zxtbm='PS'
         ORDER BY id
     </select>
 
@@ -184,7 +184,8 @@
     </delete>
 
     <insert id="addRoleForMenu" parameterType="Map">
-        INSERT INTO syifrp (GWDM,MS,ZXTBM,GNLB) VALUES (#{role_code},#{menu_name},#{system_code},#{gnlb})
+        INSERT INTO syifrp (GWDM,MS,ZXTBM,GNLB) VALUES
+                            (#{role_code},#{menu_name},#{system_code},#{gnlb})
     </insert>
 
     <delete id="deleteRoleForMenu" parameterType="Map">
@@ -192,4 +193,7 @@
                                   and ZXTBM = #{system_code} AND gnlb = #{gnlb}
     </delete>
 
+    <update id="updatePassword">
+        update SYUSERP set PWD=#{newPWD} where YHDM=#{yhdm}
+    </update>
 </mapper>