零件的添加与修改

cloud-model/src/main/java/com/hssx/cloudmodel/controller/PartController.java

@@ -58,20 +58,21 @@ public class PartController {
         msg = partService.importPartExcel(file, userVO);
         return msg;
     }
-//    /**
-//     * 单个零件添加
-//     * file excel文件 token 用户身份凭证 mouldId 模具id
-//     * @throws Exception
-//     */
-//    @ApiOperation("零件的excel导入")
-//    @RequestMapping(value = "/importAppLogin")
-//    @ResponseBody
-//    public HttpRespMsg addOrUpdate(
-//            Part part,
-//            UserVO userVO) {
-//        HttpRespMsg msg = new HttpRespMsg();
-//        msg = partService.add();
-//        return msg;
-//    }
+    /**
+     * 单个零件添加
+     * file excel文件 token 用户身份凭证 mouldId 模具id
+     * @throws Exception
+     */
+    @ApiOperation("零件的excel导入")
+    @RequestMapping(value = "/importAppLogin")
+    @ResponseBody
+    public HttpRespMsg addOrUpdate(
+            Part part,
+            UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = partService.add(part,
+                userVO);
+        return msg;
+    }
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldMaintain.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -70,6 +72,7 @@ public class MouldMaintain extends Model<MouldMaintain> {
      * 保养日期
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Part.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -43,6 +45,7 @@ public class Part extends Model<Part> {
      * 添加的时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -97,6 +99,7 @@ public class User extends Model<User> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/service/PartService.java

@@ -19,4 +19,6 @@ import javax.servlet.http.HttpServletResponse;
 public interface PartService extends IService<Part> {
 
     HttpRespMsg importPartExcel(MultipartFile file, UserVO userVO);
+
+    HttpRespMsg add(Part part, UserVO userVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/PartServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.Part;
 import com.hssx.cloudmodel.entity.User;
@@ -114,6 +115,32 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg add(Part part, UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(part.getId() != null){
+            //修改
+            Part m = partMapper.selectOne(new QueryWrapper<Part>().eq("part_no", part.getPartNo()));
+            if ((m != null && m.getId() == part.getId()) || m == null) {
+                partMapper.updateById(part);
+            } else {
+                msg.setError("当前模具编号已存在，请重新输入其他模具编号");
+            }
+        }else{
+            //添加
+            Mould mould = mouldMapper.selectById(userVO.getMouldId());
+            User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+            if(part.getPartLife()<mould.getSettingLife()){
+                part.setIsVulnerable(1);
+            }
+            part.setCreatorId(user.getId());
+            part.setCreator(user.getUsername());
+            partMapper.insert(part);
+        }
+        return msg;
+    }
+
     /**
      * 输入流转file
      *

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -144,6 +144,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             } else if (flag == 1) {
                 //更新角色信息
+                Company company = companyMapper.selectById(user.getCompanyId());
+                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+                    user.setSubordinateType(Constant.ASSETS_COMPANY);
+                    user.setTeamName("资产方");
+                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+                    user.setTeamName("生产方");
+                }
                 userMapper.updateById(user);
             }
         } else if (Constant.SYS_ID == parentUser.getParentId()) {
@@ -196,6 +204,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             } else if (flag == 1) {
                 //更新角色信息
+                Company company = companyMapper.selectById(user.getCompanyId());
+                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+                    user.setSubordinateType(Constant.ASSETS_COMPANY);
+                    user.setTeamName("资产方");
+                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+                    user.setTeamName("生产方");
+                }
                 userMapper.updateById(user);
             }
         } else {
@@ -252,6 +268,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             } else if (flag == 1) {
                 //更新角色信息
+                Company company = companyMapper.selectById(user.getCompanyId());
+                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+                    user.setSubordinateType(Constant.ASSETS_COMPANY);
+                    user.setTeamName("资产方");
+                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+                    user.setTeamName("生产方");
+                }
                 userMapper.updateById(user);
             }
         }