生物防控人员

huimv-receive/src/main/java/com/huimv/receive/common/utils/SendSMS.java

@@ -40,9 +40,15 @@ public class SendSMS {
          * 发送给用户
          */
         ArrayList<String> phoneList = new ArrayList<>();
-        phoneList.add("15869188386");
-        String content ="测试结果";
+        phoneList.add("13140429955");
+        String content ="保育2高温报警; 保育2高温报警已经恢复";
         sendSMS(phoneList,content);
+//        MD5 md5 = SecureUtil.md5();
+//        String md5PassWord = md5.digestHex(passWord);
+//        System.out.println(md5PassWord);
+//        System.out.println(userNmae+"【慧牧科技】测试结果"+"1694157718734"+md5PassWord);
+//        String sign = md5.digestHex(userNmae+"【慧牧科技】测试结果"+"1694157718734"+md5PassWord);
+//        System.out.println(sign);
 
     }
 
@@ -55,9 +61,6 @@ public class SendSMS {
 
         // 设置请求参数
         Map params = new HashMap();
-//        ArrayList<String> phoneList = new ArrayList<>();
-//        phoneList.add("13140429955");
-//        String content ="【慧牧科技】测试结果";
         content =   "【慧牧科技】"+content;
         long timestamp = System.currentTimeMillis();
         params.put("userName", userNmae);
@@ -66,6 +69,7 @@ public class SendSMS {
         params.put("timestamp", timestamp);
         MD5 md5 = SecureUtil.md5();
         String md5PassWord = md5.digestHex(passWord);
+        System.out.println(md5PassWord);
         String sign = md5.digestHex(userNmae+content+timestamp+md5PassWord);
 
         params.put("sign", sign);
@@ -81,14 +85,6 @@ public class SendSMS {
         System.out.println(responseBody);
 
     }
-//    public static void sendSMS(String[] mobiles, String content) {
-//        for (String mobile : mobiles) {
-//            String httpArg = "accesskey=5493&secretkey=7e6f0b6e9d12d2c750cbf1932a4b9cc53e36509b&mobile=" + mobile + "&content=" + content + "通知【慧牧科技】";
-//            System.out.println(httpArg);
-//            String jsonResult = request(httpUrl, httpArg);
-//            System.out.println(jsonResult);//返回码
-//        }
-//    }
 
 
     public static String request(String httpUrl, String httpArg) {

huimv-receive/src/main/java/com/huimv/receive/controller/BillPersonnelAdmissionController.java

@@ -72,6 +72,11 @@ public class BillPersonnelAdmissionController {
     public Result listAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
         return billPersonnelAdmissionService.listAdmission(httpServletRequest,paramsMap);
     }
+    @PostMapping("/uploadImgAndAdmissin")
+    public Result uploadImgAndAdmissin(@RequestParam(value = "imgUrl") MultipartFile imgUrl,
+                                       @RequestParam(value = "id") Integer id) throws IOException {
+        return billPersonnelAdmissionService.uploadImgAndAdmissin(imgUrl,id);
+    }
 
     @PostMapping("/handleAdmission")
     public Result handleAdmission (HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){

huimv-receive/src/main/java/com/huimv/receive/controller/LoginController.java

@@ -40,6 +40,7 @@ public class LoginController {
     ILoginService iLoginService;
     @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
+
     @Autowired
     private UploadImage uploadImage;
 
@@ -125,6 +126,40 @@ public class LoginController {
         return result;
     }
 
+    @PostMapping(value = "/switchUserType")
+    public Result switchUserType(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+
+        String type = map.get("type");
+        String remoteHost = req.getRemoteHost();
+        // 未对密码加密
+            SysAccountMultilevel accountEntity = accountMultilevelService.getById(userId);
+
+            accountEntity.setType(Integer.parseInt(type));
+            accountMultilevelService.updateById(accountEntity);
+
+            Integer id = accountEntity.getId();
+            IpTools.getRemoteHost(req);
+            AccessToken accessToken = new AccessToken();
+            accessToken.setCreated(new Date());
+            accessToken.setAccountName(accountEntity.getAccount());
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(accountEntity.getAccount(), id, accountEntity.getFarmIds(), null, null);
+            accessToken.setToken(token);
+
+            accessToken.setId(id);
+            accessToken.setLoginIp(remoteHost);
+            accessToken.setType(accountEntity.getType());
+            Integer lastFarmId = accountEntity.getLastFarmId();
+            if (ObjectUtil.isEmpty(lastFarmId)) {
+                lastFarmId = Integer.parseInt(accountEntity.getFarmIds().split(",")[0]);
+            }
+            accessToken.setLastFarmId(lastFarmId);
+            accessToken.setUserName(accountEntity.getUserName());
+
+            return new Result(ResultCode.SUCCESS, accessToken);
+    }
+
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req) {

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -15,9 +15,14 @@ import com.huimv.receive.service.ISysUserService;
 import com.huimv.receive.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -34,6 +39,9 @@ public class SysUserController {
     @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
 
+    @Autowired
+    private UploadImage uploadImage;
+
 
 //    @PostMapping("/list")
 //    public JSONObject listUser(@RequestBody Map map) {
@@ -63,13 +71,80 @@ public class SysUserController {
 
     //员工新增
     @PostMapping("/add")
-    public Result add(@RequestBody SysUser sysUser) {
-        String cardType = sysUser.getCardType();
-        String cardNum = sysUser.getCardNum();
+    public Result add(@RequestParam("userId") String userId,
+                      @RequestParam(value = "userName",required = false) String userName,
+                      @RequestParam(value = "gender",required = false) Integer gender,
+                      @RequestParam(value = "nation",required = false) String nation,
+                      @RequestParam(value = "nativePlace",required = false) String nativePlace,
+                      @RequestParam(value = "birthday",required = false) String birthday,
+                      @RequestParam(value = "politicsPace",required = false) String politicsPace,
+                      @RequestParam(value = "peopleType",required = false) String peopleType,
+                      @RequestParam(value = "educationalLevel",required = false) String educationalLevel,
+                      @RequestParam(value = "cardType",required = false) String cardType,
+                      @RequestParam(value = "cardNum",required = false) String cardNum,
+                      @RequestParam(value = "userPhone",required = false) String userPhone,
+                      @RequestParam(value = "publicPhone",required = false) String publicPhone,
+                      @RequestParam(value = "userMali",required = false) String userMali,
+                      @RequestParam(value = "publicMali",required = false) String publicMali,
+                      @RequestParam(value = "entryTime",required = false) String entryTime,
+                      @RequestParam(value = "probation",required = false) String probation,
+                      @RequestParam(value = "department",required = false) String department,
+                      @RequestParam(value = "job",required = false) String job,
+                      @RequestParam(value = "jobType",required = false) String jobType,
+                      @RequestParam(value = "workLocation",required = false) String workLocation,
+                      @RequestParam(value = "workLocationType",required = false) Integer workLocationType,
+                      @RequestParam(value = "farmId",required = false) String farmId,
+                      @RequestParam(value = "emergentUser",required = false) String emergentUser,
+                      @RequestParam(value = "emergentUserPhone,required = false") String emergentUserPhone,
+                      @RequestParam(value = "sheng",required = false) String sheng,
+                      @RequestParam(value = "shi",required = false) String shi,
+                      @RequestParam(value = "xxdz",required = false) String xxdz,
+                      @RequestParam(value = "yzbm",required = false) String yzbm,
+                      @RequestParam("imgUrl") MultipartFile imgUrl) throws IOException {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserName(userName);
+        sysUser.setUserId(userId);
+        sysUser.setGender(gender);
+        sysUser.setNation(nation);
+        sysUser.setNativePlace(nativePlace);
+
+        sysUser.setBirthday(DateUtil.parse(birthday,"yyyy-MM-dd"));
+        sysUser.setPoliticsPace(politicsPace);
+        sysUser.setPeopleType(peopleType);
+        sysUser.setEducationalLevel(educationalLevel);
+        sysUser.setCardType(cardType);
+        sysUser.setCardNum(cardNum);
+        sysUser.setUserPhone(userPhone);
+        sysUser.setPublicPhone(publicPhone);
+        sysUser.setUserMali(userMali);
+        sysUser.setPublicMali(publicMali);
+        sysUser.setEntryTime(DateUtil.parse(entryTime,"yyyy-MM-dd"));
+        sysUser.setProbation(probation);
+        sysUser.setDepartment(department);
+        sysUser.setJob(job);
+        sysUser.setJobType(jobType);
+        sysUser.setWorkLocation(workLocation);
+        sysUser.setWorkLocationType(workLocationType);
+        sysUser.setFarmId(farmId);
+        sysUser.setEmergentUser(emergentUser);
+        sysUser.setEmergentUserPhone(emergentUserPhone);
+        sysUser.setSheng(sheng);
+        sysUser.setShi(shi);
+        sysUser.setXxdz(xxdz);
+        sysUser.setYzbm(yzbm);
+
+        if (ObjectUtil.isNotEmpty(imgUrl)) {
+            String imageCom = uploadImage.getImageCom(imgUrl);
+            if ("上传失败".equals(imageCom)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }else {
+                sysUser.setImgUrl(imageCom);
+            }
+        }
         if ("身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum))
             return new Result(10001,"身份证格式不正确",false);
 
-        String userPhone = sysUser.getUserPhone();
         if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
             return new Result(10001,"手机号格式不正确",false);
 
@@ -87,6 +162,7 @@ public class SysUserController {
         return new Result(10000,"保存成功",true);
     }
 
+
     //查询工作地点
     @PostMapping("/listWorkLocation")
     public Result listWorkLocation(@RequestBody Map map) {
@@ -94,12 +170,81 @@ public class SysUserController {
     }
 
     @PostMapping("/update")
-    public Result update(@RequestBody SysUser sysUser) {
-        String cardType = sysUser.getCardType();
-        String cardNum = sysUser.getCardNum();
+    public Result update(@RequestParam("id") Integer id,
+                         @RequestParam("userId") String userId,
+                         @RequestParam(value = "userName",required = false) String userName,
+                         @RequestParam(value = "gender",required = false) Integer gender,
+                         @RequestParam(value = "nation",required = false) String nation,
+                         @RequestParam(value = "nativePlace",required = false) String nativePlace,
+                         @RequestParam(value = "birthday",required = false) String birthday,
+                         @RequestParam(value = "politicsPace",required = false) String politicsPace,
+                         @RequestParam(value = "peopleType",required = false) String peopleType,
+                         @RequestParam(value = "educationalLevel",required = false) String educationalLevel,
+                         @RequestParam(value = "cardType",required = false) String cardType,
+                         @RequestParam(value = "cardNum",required = false) String cardNum,
+                         @RequestParam(value = "userPhone",required = false) String userPhone,
+                         @RequestParam(value = "publicPhone",required = false) String publicPhone,
+                         @RequestParam(value = "userMali",required = false) String userMali,
+                         @RequestParam(value = "publicMali",required = false) String publicMali,
+                         @RequestParam(value = "entryTime",required = false) String entryTime,
+                         @RequestParam(value = "probation",required = false) String probation,
+                         @RequestParam(value = "department",required = false) String department,
+                         @RequestParam(value = "job",required = false) String job,
+                         @RequestParam(value = "jobType",required = false) String jobType,
+                         @RequestParam(value = "workLocation",required = false) String workLocation,
+                         @RequestParam(value = "workLocationType",required = false) Integer workLocationType,
+                         @RequestParam(value = "farmId",required = false) String farmId,
+                         @RequestParam(value = "emergentUser",required = false) String emergentUser,
+                         @RequestParam(value = "emergentUserPhone,required = false") String emergentUserPhone,
+                         @RequestParam(value = "sheng",required = false) String sheng,
+                         @RequestParam(value = "shi",required = false) String shi,
+                         @RequestParam(value = "xxdz",required = false) String xxdz,
+                         @RequestParam(value = "yzbm",required = false) String yzbm,
+                         @RequestParam("imgUrl") MultipartFile imgUrl) throws IOException {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserName(userName);
+        sysUser.setId(id);
+        sysUser.setUserId(userId);
+        sysUser.setGender(gender);
+        sysUser.setNation(nation);
+        sysUser.setNativePlace(nativePlace);
+
+        sysUser.setBirthday(DateUtil.parse(birthday,"yyyy-MM-dd"));
+        sysUser.setPoliticsPace(politicsPace);
+        sysUser.setPeopleType(peopleType);
+        sysUser.setEducationalLevel(educationalLevel);
+        sysUser.setCardType(cardType);
+        sysUser.setCardNum(cardNum);
+        sysUser.setUserPhone(userPhone);
+        sysUser.setPublicPhone(publicPhone);
+        sysUser.setUserMali(userMali);
+        sysUser.setPublicMali(publicMali);
+        sysUser.setEntryTime(DateUtil.parse(entryTime,"yyyy-MM-dd"));
+        sysUser.setProbation(probation);
+        sysUser.setDepartment(department);
+        sysUser.setJob(job);
+        sysUser.setJobType(jobType);
+        sysUser.setWorkLocation(workLocation);
+        sysUser.setWorkLocationType(workLocationType);
+        sysUser.setFarmId(farmId);
+        sysUser.setEmergentUser(emergentUser);
+        sysUser.setEmergentUserPhone(emergentUserPhone);
+        sysUser.setSheng(sheng);
+        sysUser.setShi(shi);
+        sysUser.setXxdz(xxdz);
+        sysUser.setYzbm(yzbm);
+
+        if (ObjectUtil.isNotEmpty(imgUrl)) {
+            String imageCom = uploadImage.getImageCom(imgUrl);
+            if ("上传失败".equals(imageCom)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }else {
+                sysUser.setImgUrl(imageCom);
+            }
+        }
 
 
-        String userPhone = sysUser.getUserPhone();
         if(StringUtils.isNotBlank(userPhone)){
             if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
                 return new Result(10001,"手机号格式不正确",false);

huimv-receive/src/main/java/com/huimv/receive/entity/BillPersonnelAdmission.java

@@ -135,4 +135,7 @@ public class BillPersonnelAdmission implements Serializable {
     private String source;
 
 
+    private String userImgUrl;
+
+
 }

huimv-receive/src/main/java/com/huimv/receive/entity/SysAccountMultilevel.java

@@ -62,5 +62,6 @@ public class SysAccountMultilevel extends Model {
     private String wechatId;
     private Integer userId;
     private Integer farmId;
+    private String jobs;
 
 }

huimv-receive/src/main/java/com/huimv/receive/entity/SysUser.java

@@ -30,7 +30,7 @@ public class SysUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     /**
      * 员工工号
@@ -134,7 +134,7 @@ public class SysUser implements Serializable {
     /**
      * 工作岗位 1 场长，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
      */
-    private Integer job;
+    private String job;
 
     /**
      * 工作性质
@@ -157,6 +157,7 @@ public class SysUser implements Serializable {
     private String shi;
     private String xxdz;
     private String yzbm;
+    private String imgUrl;
 
 
 }

huimv-receive/src/main/java/com/huimv/receive/service/IBillPersonnelAdmissionService.java

@@ -65,4 +65,6 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
 
     //导出
     void printAdmission(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
+
+    Result uploadImgAndAdmissin(MultipartFile imgUrl, Integer id) throws IOException;
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -78,6 +78,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 return new Result(10001, "身份证号格式错误!", false);
             }
         }
+        SysAccountMultilevel sysAccountMultilevel1 = sysAccountMultilevelMapper.selectById(phone);
+
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         BillPersonnelAdmission billPersonnelAdmission = new BillPersonnelAdmission();
         billPersonnelAdmission.setAdmissionType(Integer.parseInt(admissionType));
@@ -92,6 +94,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setWorkName(workName);
         billPersonnelAdmission.setPapersType(Integer.parseInt(papersType));
         billPersonnelAdmission.setPapersCode(papersCode);
+        billPersonnelAdmission.setUserImgUrl(sysAccountMultilevel1.getImgUrl());
         if (ObjectUtil.isNotEmpty(carNum)) {
             billPersonnelAdmission.setCarNum(carNum);
         }
@@ -592,6 +595,28 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         Print.printAdmission(list);
     }
 
+    @Override
+    public Result uploadImgAndAdmissin(MultipartFile imgUrl, Integer id) throws IOException {
+        BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
+        String imageCom = "";
+        if (ObjectUtil.isNotEmpty(imgUrl)) {
+            if (uploadImage.getImageCom(imgUrl).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }
+            imageCom =  uploadImage.getImageCom(imgUrl);
+        }
+
+        billPersonnelAdmission.setUserImgUrl(imageCom);
+        billPersonnelAdmissionMapper.updateById(billPersonnelAdmission);
+        SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();
+
+        sysAccountMultilevel.setId(billPersonnelAdmission.getAdmissionUserId());
+        sysAccountMultilevel.setImgUrl(imageCom);
+        sysAccountMultilevelMapper.updateById(sysAccountMultilevel);
+        return new Result(10000,"修改成功",true);
+    }
+
     /*数组排序*/
     public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {
         //存放排序结果json数组

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -149,7 +149,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysAccountMultilevel.setAccountStatus(1);
         sysAccountMultilevel.setFarmId(Integer.parseInt(sysUser.getFarmId()));
         sysAccountMultilevel.setFarmIds(sysUser.getFarmId());
-        sysAccountMultilevel.setType(sysUser.getJob());
+        sysAccountMultilevel.setJobs(sysUser.getJob());
+        sysAccountMultilevel.setType(Integer.parseInt(sysUser.getJob().split(",")[0]));
         sysAccountMultilevel.setWorkLocation(sysUser.getWorkLocation());
         sysAccountMultilevel.setWorkLocationType(sysUser.getWorkLocationType());
         sysAccountMultilevel.setPhone(sysUser.getUserPhone());
@@ -158,6 +159,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysAccountMultilevel.setLastFarmId(Integer.parseInt(sysUser.getFarmId()));
         sysAccountMultilevel.setPid(0);
         sysAccountMultilevel.setPids("");
+        sysAccountMultilevel.setImgUrl(sysUser.getImgUrl());
 //        sysAccountMultilevel.setPapersType(sysUser.getCardType());
         sysAccountMultilevel.setUserId(id);
         sysAccountMultilevelMapper.insert(sysAccountMultilevel);