生物防控人员2

huimv-admin/src/main/java/com/huimv/admin/entity/ProdStock.java

@@ -25,6 +25,7 @@ import lombok.experimental.Accessors;
 @TableName("prod_stock")
 public class ProdStock implements Serializable {
 
+
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdStockServiceImpl.java

@@ -221,8 +221,8 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         Map sjtjMap = new HashMap();
         sjtjMap.put("CLCH",100);
         sjtjMap.put("YFCH",100);
-        sjtjMap.put("MRWLL",1.50);
-        sjtjMap.put("RZZ",731);
+        sjtjMap.put("MRWLL",0);
+        sjtjMap.put("RZZ",0);
         sjtjMap.put("SWPIG",0);
 
         Map zjjMap = new HashMap();
@@ -230,7 +230,17 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         zjjMap.put("YFCL",0);
         zjjMap.put("JRCL",0);
         zjjMap.put("JRJZ",0);
+
+
         Map endMap = new HashMap();
+        endMap.put("CLBD",new ArrayList<>());
+        ProdStock prodStock1 = new ProdStock();
+        prodStock1.setDong1(0);
+        prodStock1.setDong2(0);
+        prodStock1.setDong3(0);
+        prodStock1.setDong4(0);
+        endMap.put("MCCL",prodStock1);
+        endMap.put("SJTJ",sjtjMap);
         if (ObjectUtil.isNotEmpty(prodStocks)){
             ProdStock prodStock = prodStocks.get(prodStocks.size()-1);
             endMap.put("CLBD",prodStocks);

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -56,7 +56,7 @@ public class ShenChanTimer {
 
 //有个问题 正康的视频咋也看不了
 
-//        @Scheduled(cron = "0 0 * * * ? ")
+//     @Scheduled(cron = "0 * * * * ? ")
     @Scheduled(cron = "1 0 * * * ?")
 //    @GetMapping("/test")
     @Transactional
@@ -67,11 +67,6 @@ public class ShenChanTimer {
         ProdStockDto prodStockDto = JSONUtil.toBean(data, ProdStockDto.class);
 //        System.out.println(prodStockDto.getData());
         List<List<Object>> stockData = prodStockDto.getData();
-//        DateTime beginOfYear = DateUtil.beginOfYear(DateUtil.offsetMonth(new Date(), -10));
-//        System.out.println(beginOfYear);
-//        for (int i = 0; i < 390; i++) {
-//            DateTime dateTime = DateUtil.offsetDay(beginOfYear, i);
-//            System.out.println("dateTime--"+dateTime);
         System.out.println("--》"+prodStockDto);
 
         for (List stock : stockData) {
@@ -338,13 +333,24 @@ public class ShenChanTimer {
         map.put("db_name", "MSSQL");
         map.put("proc_name", "rep_yz_kc_hz");
         map.put("method", "open_proc");
-        HashMap<String, Object> maps = new HashMap<>();
         List list = new ArrayList();
+        HashMap<String, Object> maps = new HashMap<>();
         maps.put("name", "@fdate");
         maps.put("value", time);
+
+        HashMap<String, Object> maps1 = new HashMap<>();
+        maps1.put("name", "@userid");
+        maps1.put("value", "");
+
+        HashMap<String, Object> maps2 = new HashMap<>();
+        maps2.put("name", "@fjs");
+        maps2.put("value", "0");
         list.add(maps);
+        list.add(maps1);
+        list.add(maps2);
         map.put("params", list);
         String params = JSON.toJSONString(map);
+        System.out.println(params);
 
         LocalDateTime timestamp = LocalDateTime.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -360,17 +366,14 @@ public class ShenChanTimer {
         String sign = signTopRequest(tokenMap, secret, "md5");
         tokenMap.put("sign",sign);
         String url1 = url + "?token=" + token + "&sign_method=md5" + "&timestamp=" + formattedDateTime + "&version=2.0" + "&sign=" + sign + "&data={data}" ;
-        String forObject = restTemplate.getForObject(url1 , String.class,params);
-        ProdStockDto prodStockDto = JSONUtil.toBean(forObject, ProdStockDto.class);
 
+        String forObject = restTemplate.getForObject(url1 , String.class,params);
         return forObject;
 
     }
 
     //获取数据 进猪数据
     private String getListJz(String token,String secret,String proc_name,DateTime dateTime) throws Exception {
-        String time1 = LocalDate.now().toString();
-        String time2 = LocalDate.now().toString();
         String url = "http://test.htpig.cn/rest/db/storedproc";
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("db_name", "MSSQL");
@@ -496,7 +499,7 @@ public class ShenChanTimer {
     }
 
 
-    private  StockLoginDto login() throws Exception {
+    private  StockLoginDto login()   {
         StockLoginDto stockLoginDto = restTemplate.getForObject("http://test.htpig.cn/rest/user/login?user_name=test&password=e10adc3949ba59abbe56e057f20f883e&db_name=MSSQL", StockLoginDto.class);
         System.out.println(stockLoginDto.toString());
         if (stockLoginDto.getStatus() != 0) {