Merge remote-tracking branch 'origin/master'

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

@@ -1,21 +1,47 @@
 package com.hssx.cloudmodel.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.service.MouldService;
+import com.hssx.cloudmodel.service.UserService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-07-30
  */
-@RestController
+@Controller
 @RequestMapping("/mould")
 public class MouldController {
-
+    @Autowired
+    private MouldService mouldService;
+    @Autowired
+    private UserService userService;
+    /**
+     * 添加/修改模具设备
+     * 添加参数：equipmentId 设备id， modelNo 模具编号
+     * 修改参数：id 模具id, modelName 模具名称，settingLife 使用年限， initialModulus 初始模次 equipmentId 设备id，
+     * produceCompanyId 生产方公司id,ocCycle 每模平均周期,rfid rfid码，area 工厂地址，factoryId 工厂id,factoryName 工厂名称
+     * belongCompanyId 所属公司id ，equipmentName 设备名称
+     * @return
+     */
+    @ApiOperation("添加/修改模具")
+    @RequestMapping("/addOrUpdate")
+    @ResponseBody
+    public HttpRespMsg addOrUpdate(Mould mould, String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("head_imgurl",token);
+        User user = userService.getOne(qw);
+        msg = mouldService.addAndUpdateMould(mould,user);
+        return msg;
+    }
 }
 

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

@@ -3,7 +3,6 @@ package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.MouldEquipment;
-import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.hssx.cloudmodel.service.UserService;
@@ -12,12 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 
 /**
  *

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 
 /**
@@ -43,26 +42,27 @@ public class ProjectController{
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag,String customerCompanyIds,
-                                           String customerCompanyNames, String token,@RequestParam(required = false) String userIds) {
+                                           String customerCompanyNames, String token,@RequestParam(required = false) String userIds,String modelIds) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("head_imgurl",token);
         User user = userService.getOne(qw);
-        msg = projectService.addAndUpdateProject(project, flag, user,userIds,customerCompanyIds,customerCompanyNames);
+        msg = projectService.addAndUpdateProject(project, flag, user,userIds,customerCompanyIds,customerCompanyNames,modelIds);
         return msg;
     }
 
     /**
      * 根据公司id获取公司下的人员
-     * 参数：companyIds 公司ids
+     * 参数：companyIds 公司ids ,id当前操作人的id
      *
      * @return
      */
     @ApiOperation("根据公司id获取公司下的人员")
     @RequestMapping("/getUserListByCompanyIds")
     @ResponseBody
-    public HttpRespMsg getUserListByCompanyIds(String companyIds){
-        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds);
+    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id){
+        System.out.println("companyIds"+companyIds);
+        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id);
         return msg;
     }
 

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-31
+ * @since 2019-08-02
  */
 @TableName("tb_mould")
 public class Mould extends Model<Mould> {
@@ -51,12 +51,6 @@ public class Mould extends Model<Mould> {
     @TableField("tonnage")
     private BigDecimal tonnage;
 
-    /**
-     * 电量
-     */
-    @TableField("hill_number")
-    private String hillNumber;
-
     /**
      * 每模平均周期
      */
@@ -70,7 +64,7 @@ public class Mould extends Model<Mould> {
     private BigDecimal dailyOutput;
 
     /**
-     * 所属客户公司id
+     * 所属资产方公司id
      */
     @TableField("company_id")
     private Integer companyId;
@@ -82,7 +76,7 @@ public class Mould extends Model<Mould> {
     private Integer currentVersionId;
 
     /**
-     * 状态
+     * 状态 0-禁止 1-运行
      */
     @TableField("state")
     private String state;
@@ -153,6 +147,12 @@ public class Mould extends Model<Mould> {
     @TableField("belong_project_grade")
     private String belongProjectGrade;
 
+    /**
+     * 生产方公司id
+     */
+    @TableField("produce_company_id")
+    private Integer produceCompanyId;
+
 
     public Integer getId() {
         return id;
@@ -194,14 +194,6 @@ public class Mould extends Model<Mould> {
         this.tonnage = tonnage;
     }
 
-    public String getHillNumber() {
-        return hillNumber;
-    }
-
-    public void setHillNumber(String hillNumber) {
-        this.hillNumber = hillNumber;
-    }
-
     public BigDecimal getOcCycle() {
         return ocCycle;
     }
@@ -330,6 +322,14 @@ public class Mould extends Model<Mould> {
         this.belongProjectGrade = belongProjectGrade;
     }
 
+    public Integer getProduceCompanyId() {
+        return produceCompanyId;
+    }
+
+    public void setProduceCompanyId(Integer produceCompanyId) {
+        this.produceCompanyId = produceCompanyId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -343,7 +343,6 @@ public class Mould extends Model<Mould> {
         ", modelName=" + modelName +
         ", waterGap=" + waterGap +
         ", tonnage=" + tonnage +
-        ", hillNumber=" + hillNumber +
         ", ocCycle=" + ocCycle +
         ", dailyOutput=" + dailyOutput +
         ", companyId=" + companyId +
@@ -360,6 +359,7 @@ public class Mould extends Model<Mould> {
         ", initialModulus=" + initialModulus +
         ", equipmentId=" + equipmentId +
         ", belongProjectGrade=" + belongProjectGrade +
+        ", produceCompanyId=" + produceCompanyId +
         "}";
     }
 }

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

@@ -69,6 +69,12 @@ public class MouldEquipment extends Model<MouldEquipment> {
     @TableField("is_use")
     private Integer isUse;
 
+    /**
+     * 电量
+     */
+    @TableField("hill_number")
+    private String hillNumber;
+
 
     public Integer getId() {
         return id;
@@ -134,6 +140,14 @@ public class MouldEquipment extends Model<MouldEquipment> {
         this.isUse = isUse;
     }
 
+    public String getHillNumber() {
+        return hillNumber;
+    }
+
+    public void setHillNumber(String hillNumber) {
+        this.hillNumber = hillNumber;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -150,6 +164,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
         ", belongCompanyId=" + belongCompanyId +
         ", equipmentNo=" + equipmentNo +
         ", isUse=" + isUse +
+        ", hillNumber=" + hillNumber +
         "}";
     }
 }

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

@@ -2,6 +2,8 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface MouldService extends IService<Mould> {
 
+    HttpRespMsg addAndUpdateMould(Mould mould, User user);
 }

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

@@ -17,7 +17,7 @@ import com.hssx.cloudmodel.util.PageUtil;
  */
 public interface ProjectService extends IService<Project> {
 
-    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,String customerCompanyIds,String customerCompanyNames);
+    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,String customerCompanyIds,String customerCompanyNames,String modelIds);
 
     HttpRespMsg handOutProject(Project project, String userIds);
 
@@ -27,5 +27,5 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getProjectDetail(Project project);
 
-    HttpRespMsg getUserListByCompanyIds(String companyIds);
+    HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId);
 }

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

@@ -1,9 +1,12 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.MouldMapper;
 import com.hssx.cloudmodel.service.MouldService;
 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;
 
 /**
@@ -16,5 +19,17 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements MouldService {
-
+    @Autowired
+    MouldMapper mouldMapper;
+    @Override
+    public HttpRespMsg addAndUpdateMould(Mould mould, User user) {
+        if(mould.getId() != null){
+            //修改
+            mouldMapper.updateById(mould);
+        }else{
+            mould.setCreatorId(user.getId());
+            mouldMapper.insert(mould);
+        }
+        return null;
+    }
 }

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

@@ -44,7 +44,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     CustomCompanyMapper customCompanyMapper;
 
     @Override
-    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,String customerCompanyIds,String customerCompanyNames) {
+    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,
+                                           String customerCompanyIds,String customerCompanyNames,String modelIds) {
         HttpRespMsg msg = new HttpRespMsg();
         if(user != null){
             QueryWrapper<Project> qw = new QueryWrapper<>();
@@ -176,11 +177,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getUserListByCompanyIds(String companyIds) {
+    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId) {
         HttpRespMsg msg = new HttpRespMsg();
         if(!"".equals(companyIds) && companyIds != null){
-            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList("companyIds");
-            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id",ids));
+            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
+            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id",ids).ne("id",adminId));
         }
         return msg;
     }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_mould_equipment");
+        strategy.setInclude("tb_mould");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/java/com/hssx/cloudmodel/util/ListUtil.java

@@ -53,7 +53,7 @@ public class ListUtil {
 		List<Integer> ids = new ArrayList<Integer>();
 		for (String a : array) {
 			if (a != null && a.length() > 0) {
-				ids.add(Integer.valueOf(a));
+				ids.add(Integer.parseInt(a));
 			}
 		}
 		return ids;

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

@@ -12,11 +12,12 @@
         <result column="belong_company_id" property="belongCompanyId" />
         <result column="equipment_no" property="equipmentNo" />
         <result column="is_use" property="isUse" />
+        <result column="hill_number" property="hillNumber" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use
+        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number
     </sql>
 
 </mapper>

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

@@ -9,7 +9,6 @@
         <result column="model_name" property="modelName" />
         <result column="water_gap" property="waterGap" />
         <result column="tonnage" property="tonnage" />
-        <result column="hill_number" property="hillNumber" />
         <result column="oc_cycle" property="ocCycle" />
         <result column="daily_output" property="dailyOutput" />
         <result column="company_id" property="companyId" />
@@ -26,11 +25,12 @@
         <result column="initial_modulus" property="initialModulus" />
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
+        <result column="produce_company_id" property="produceCompanyId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, model_no, model_name, water_gap, tonnage, hill_number, 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
+        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>
 
 </mapper>