任务 9900

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -10,7 +10,9 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.fegin.SystemctlFeign;
 import com.yeejoin.equipmanage.mapper.*;
+import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.catalina.util.IOTools;
 import org.apache.commons.lang.StringUtils;
@@ -98,6 +100,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     IEquPropertyService equPropertyService;
     @Autowired
+    private RemoteSecurityService remoteSecurityService;
+    @Autowired
+    private SystemctlFeign systemctlFeign;
+    @Autowired
     @Lazy
     IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
     @Autowired
@@ -1823,7 +1829,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         equipSpecificScrap.forEach(e->{
             try {
                 int year = e.get("weExpiry") != null ? Integer.parseInt(e.get("weExpiry").toString())  : Integer.parseInt(e.get("wesExpiry").toString());
-                Date productDate = DateUtils.dateParse(e.get("product").toString(),DateUtils.DATE_TIME_PATTERN);
+                Date productDate = DateUtils.dateParse(e.get("product").toString(),"yyyy-MM-dd'T'HH:mm");
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(productDate);
                 calendar.add(Calendar.YEAR, year);
@@ -1831,7 +1837,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 Date now = new Date();
                 String scrapTime = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(calendar.getTime());
 
-                int i = 0;
+                int i = -1;
                 while (now.after(calendar.getTime())) {
                     calendar.add(Calendar.DAY_OF_MONTH,1);
                     i++;
@@ -1853,7 +1859,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             model.setTitle("报废到期提醒");
 
             String equipName = map.get("name").toString();
-            String location = map.get("sName").toString() + map.get("position").toString() ;
+            String location = map.get("sname").toString() + map.get("position").toString() ;
 
             String body = String.format("%s-%s于%s报废，请提前更换处理", equipName, location, scrapTime);
             String join = String.format("设备还剩%s天报废，请提前更换", i);
@@ -1874,7 +1880,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             ext.put("time", new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()));
             model.setExtras(ext);
             model.setRecivers(receive);
-            Systemctl.messageClient.create(model);
+            // Systemctl.messageClient.create(model);
+            Token token = remoteSecurityService.getServerToken();
+            systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
         } catch (Exception e) {
             e.printStackTrace();
         }