Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

@@ -4,9 +4,10 @@ package com.hssx.cloudmodel.controller;
 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.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
-import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.service.CompanyService;
+import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.hssx.cloudmodel.service.MouldService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -16,6 +17,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 /**
  * @author 吴涛涛
  * @since 2019-07-30
@@ -29,9 +32,11 @@ public class MouldController {
     private UserService userService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private MouldEquipmentService mouldEquipmentService;
     /**
      * 添加/修改模具设备
-     * 添加参数：equipmentId 设备id， modelNo 模具编号 ,belongCompanyId 所属公司id,modelName 模具名称
+     * 添加参数：equipmentId 设备id， modelNo 模具编号 ,modelName 模具名称
      * 修改参数：id 模具id, settingLife 使用年限， initialModulus 初始模次 equipmentId 设备id，
      * produceCompanyId 生产方公司id,ocCycle 每模平均周期,rfid rfid码，area 工厂地址，factoryId 工厂id,factoryName 工厂名称
      * equipmentName 设备名称
@@ -62,5 +67,20 @@ public class MouldController {
         msg.data  = companyService.list(qw);
         return msg;
     }
+
+    /**
+     * 获取资产方公司的设备列表
+     * 参数 belongCompanyId 当前登录人公司id
+     * @return
+     */
+    @ApiOperation("获取资产方公司的设备列表")
+    @RequestMapping("/getMouldEquipmentList")
+    @ResponseBody
+    public HttpRespMsg getMouldEquipmentList(MouldEquipment mouldEquipment){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = mouldEquipmentService.list(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipment.getBelongCompanyId()));
+        return msg;
+    }
+
 }
 

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

@@ -29,8 +29,7 @@ public class MouldEquipmentController {
     /**
      * 添加/修改模具设备
      * 添加参数：equipmentName 设备名称，useLife 使用年限， equipmentNo 设备编号 ，
-     * belongCompanyId 所属公司id ，equipmentName 设备名称
-     * 修改时需多传的参数 id 设备id
+     * 修改时需多传的参数 id 设备id， belongCompanyId 所属公司id ，equipmentName 设备名称
      * @return
      */
     @ApiOperation("添加/修改模具设备")

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldMapper.java

@@ -2,6 +2,8 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.Project;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MouldMapper extends BaseMapper<Mould> {
 
+    void updateMouldByProjectId(@Param("project") Project project);
 }

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

@@ -13,6 +13,7 @@ import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -25,9 +26,9 @@ import java.util.List;
  */
 @Service
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
-    @Autowired
+    @Resource
     CompanyMapper companyMapper;
-    @Autowired
+    @Resource
     UserMapper userMapper;
 
     @Override

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

@@ -13,6 +13,7 @@ import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -26,7 +27,7 @@ import java.util.List;
 @Service
 public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> implements FactoryService {
 
-    @Autowired
+    @Resource
     FactoryMapper factoryMapper;
     @Override
     public HttpRespMsg addAndUpdateFactory(Factory factory, Integer flag) {

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

@@ -6,12 +6,15 @@ import com.hssx.cloudmodel.mapper.MouldEquipmentMapper;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -19,20 +22,21 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper, MouldEquipment> implements MouldEquipmentService {
-    @Autowired
+    @Resource
     MouldEquipmentMapper mouldEquipmentMapper;
+
     @Override
     public HttpRespMsg addAndUpdateMouldEquipment(MouldEquipment mouldEquipment, User user) {
-        HttpRespMsg msg  = new HttpRespMsg();
-        if(user.getParentId() == 0){
-            if(mouldEquipment.getId() == null){
+        HttpRespMsg msg = new HttpRespMsg();
+        if (user.getParentId() == 0) {
+            if (mouldEquipment.getId() == null) {
                 //添加设备
                 mouldEquipmentMapper.insert(mouldEquipment);
-            }else{
+            } else {
                 //修改设备
                 mouldEquipmentMapper.updateById(mouldEquipment);
             }
-        }else{
+        } else {
             msg.setError("对不起，您不是管理员，不具备设备创建或修改的权限");
         }
         return msg;
@@ -42,10 +46,13 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     public HttpRespMsg isUse(MouldEquipment mouldEquipment, User user) {
         HttpRespMsg msg = new HttpRespMsg();
         //判断是不是超级管理员，是才可操作
-        if(user.getParentId() == 0){
-                //修改设备
-                mouldEquipmentMapper.updateById(mouldEquipment);
-        }else{
+        if (user.getParentId() == 0) {
+            //修改设备
+            LocalDateTime now = LocalDateTime.now();
+            mouldEquipment.setStartTime(now);
+            mouldEquipment.setEndTime(now.plusYears(mouldEquipment.getUseLife()));
+            mouldEquipmentMapper.updateById(mouldEquipment);
+        } else {
             msg.setError("对不起，您不是管理员，不具备启用设备的权限");
         }
         return msg;

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

@@ -9,6 +9,8 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  *  服务实现类
@@ -19,7 +21,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements MouldService {
-    @Autowired
+    @Resource
     MouldMapper mouldMapper;
     @Override
     public HttpRespMsg addAndUpdateMould(Mould mould, User user) {

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

@@ -15,6 +15,7 @@ import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.jws.soap.SOAPBinding;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -32,17 +33,17 @@ import java.util.Spliterator;
 @Service
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
 
-    @Autowired
+    @Resource
     ProjectMapper projectMapper;
-    @Autowired
+    @Resource
     ProjectUserMapper projectUserMapper;
-    @Autowired
+    @Resource
     UserMapper userMapper;
-    @Autowired
+    @Resource
     CompanyMapper companyMapper;
-    @Autowired
+    @Resource
     CustomCompanyMapper customCompanyMapper;
-    @Autowired
+    @Resource
     MouldMapper mouldMapper;
 
     @Override
@@ -95,7 +96,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 projectUserMapper.delete(qwPro);
                 //再次重新分配
                 this.handOutProject(project, userIds);
-                //模具的分配
+                //删除之前分配与项目关联的模具,即将之前的关联项目id修改成未关联
+                mouldMapper.updateMouldByProjectId(project);
+                //再次模具的分配
                 if(modelIds != null && !"".equals(modelIds)){
                     List<Integer> modelList = ListUtil.convertIntegerIdsArrayToList(modelIds);
                     int index = 1;

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

@@ -15,6 +15,7 @@ import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.UUID;
@@ -29,15 +30,15 @@ import java.util.UUID;
  */
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-    @Autowired
+    @Resource
     UserMapper userMapper;
-    @Autowired
+    @Resource
     CompanyMapper companyMapper;
-    @Autowired
+    @Resource
     UserCompanyMapper userCompanyMapper;
-    @Autowired
+    @Resource
     ProjectUserMapper projectUserMapper;
-    @Autowired
+    @Resource
     ProjectMapper projectMapper;
 
     @Override

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -32,5 +32,7 @@
     <sql id="Base_Column_List">
         id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id
     </sql>
-
+    <update id="updateMouldByProjectId">
+        update tb_mould set project_id = null where project_id = #{project.id}
+    </update>
 </mapper>