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

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.service.impl;
 
+import ch.qos.logback.core.net.SyslogOutputStream;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -90,6 +91,11 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
             Project pro = projectMapper.selectById(userVO.getProjectId());
             if (pro.getManagerId().equals(user.getId())) {
                 //资产方管理员或者担任项目经理的人才可修改人员权限
+                if("".equals(userVO.getPowers())){
+                    //删除全部权限
+                    powerMapper.delete(new QueryWrapper<Power>().eq("user_id", userVO.getId()).eq("project_id", userVO.getProjectId()));
+                    return msg;
+                }
                 if (null != userVO.getPowers()) {
                     List<Integer> powerTypes = ListUtil.convertIntegerIdsArrayToList(userVO.getPowers());
                     if (powerTypes.size() > 0) {

cloud-model/src/main/resources/application-prod.properties

@@ -1,6 +1,9 @@
 # ####################################################################################################
 # 服务端配置
-server.port=9099
+#云模端口
+#server.port=9099
+#火石端口
+server.port=8092
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1
@@ -16,12 +19,12 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # 云模服务器对应的数据库
 #spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 # 我们测试的自己服务器数据库
-#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.username=root
-#spring.datasource.password=p011430seya1026
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=Hssx2019.!
+spring.datasource.password=p011430seya1026
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.username=root
+#spring.datasource.password=Hssx2019.!
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################

cloud-model/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # ·þÎñ¶ËÅäÖÃ
-server.port=8099
+server.port=9099
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1
@@ -14,7 +14,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

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

@@ -90,7 +90,7 @@
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbco.company_name produceCompany,tbm.pre_update_id,
         tbp.manager mangerName,tbco.company_address area,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,tbmp.equipment_name equipmentName,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times,
-        tbmp.lng,tbmp.lat,tbmp.stage,(SELECT indate FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY indate DESC LIMIT 1) lastopentime
+        tbmp.lng,tbmp.lat,tbmp.stage,(SELECT open_time FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY open_time DESC LIMIT 1) lastopentime
         ,tbmp.curhill_number hillNumber,tbmp.curtemperature temperature
         from
         tb_mould tbm
@@ -140,7 +140,7 @@
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.holes,tbm.pre_update_id,tbco.company_name produceCompany,
         tbp.manager mangerName,tbco.company_address area,tbm.oc_cycle oc_cycle,tbm.creator_id creator_id,tbmp.equipment_name equipmentName,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times,
-        tbmp.lng,tbmp.lat,tbmp.stage,(SELECT indate FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY indate DESC LIMIT 1) lastopentime,
+        tbmp.lng,tbmp.lat,tbmp.stage,(SELECT open_time FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY open_time DESC LIMIT 1) lastopentime,
         tbmp.curhill_number hillNumber,
         tbmp.curtemperature temperature
         from

cloud-socket/src/com/js/kbt/task/MyTask.java

@@ -24,8 +24,9 @@ public class MyTask {
 	public void doTask() throws Exception {
 		Date now = new Date();
 		log.info("定时任务:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now));
-		//规则是， 运动状态下，上次接受，超过1个小时，不到6个小时的模具设备，状态设置为5-异常，6小时以上的，状态设置为掉线
+		//规则是， 运动状态下，上次接受，超过1.5个小时，不到6个小时的模具设备，状态设置为5-异常，6小时以上的，状态设置为掉线
 		now.setHours(now.getHours() -1);
+		now.setMinutes(now.getMinutes()-30);
 		TbMouldExample example = new TbMouldExample();
 		example.createCriteria().andStateEqualTo("1").andLastRecTimeLessThanOrEqualTo(now);
 		TbMould mould = new TbMould();