生物防控人员2

huimv-admin/src/main/java/com/huimv/admin/controller/ProdStockController.java

@@ -65,6 +65,10 @@ public class ProdStockController {
         return prodStockService.listStockScreenHengluDay(httpServletRequest,paramsMap);
     }
 
+    @RequestMapping("/listStockScreenHengluMonth")
+    public Result listStockScreenHengluMonth(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return prodStockService.listStockScreenHengluMonth(httpServletRequest,paramsMap);
+    }
     @RequestMapping("/listStockScreenHengluYear")
     public Result listStockScreenHengluYear(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodStockService.listStockScreenHengluYear(httpServletRequest,paramsMap);

huimv-admin/src/main/java/com/huimv/admin/service/IProdStockService.java

@@ -39,4 +39,6 @@ public interface IProdStockService extends IService<ProdStock> {
     Result listStockScreenHengluYear(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listWarning(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listStockScreenHengluMonth(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -50,6 +50,9 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
     private ProdYearOutPigMapper prodYearOutPigMapper;
 
     @Autowired
+    private ProdMonthOutPigMapper prodMonthOutPigMapper;
+
+    @Autowired
     private ProdWarningInfoMapper prodWarningInfoMapper;
 
     @Override
@@ -303,5 +306,24 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         return new Result(ResultCode.SUCCESS,prodWarningInfos);
     }
 
+    @Override
+    public Result listStockScreenHengluMonth(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+
+        String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "10";
+        }
+
+        Page<ProdMonthOutPig> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,prodMonthOutPigMapper.selectPage(page,new QueryWrapper<ProdMonthOutPig>().eq("farm_id",farmId).orderByDesc("creat_time")));
+
+    }
+
 
 }

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

@@ -19,15 +19,9 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
 
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
 import java.io.IOException;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -203,10 +197,10 @@ public class ShenChanTimer {
         Integer monthOutPig =  prodStockService.sumOutPig(farmId,beginOfMonth,DateUtil.endOfMonth(dateTime));
         Integer yearInPig = prodStockService.sumInPig(farmId,beginOfYear);
         Integer yearOutPig =  prodStockService.sumOutPig(farmId,beginOfYear,DateUtil.endOfYear(dateTime));
-        prodStock.setMonthInPig(monthInPig);
-        prodStock.setMonthOutPig(monthOutPig);
-        prodStock.setYearInPig(yearInPig);
-        prodStock.setYearOutPig(yearOutPig);
+        prodStock.setMonthInPig(monthInPig + intjz);
+        prodStock.setMonthOutPig(monthOutPig +intsw+intsx);
+        prodStock.setYearInPig(yearInPig+ intjz);
+        prodStock.setYearOutPig(yearOutPig +intsw+intsx);
         prodStock.setSiPig(intsw);
         DecimalFormat df = new DecimalFormat("#.##");
 

huimv-admin/src/main/resources/com/huimv/admin/mapper/ProdStockMapper.xml

@@ -17,7 +17,6 @@
         <result column="SPZCL" property="spzcl" />
         <result column="creat_time" property="creatTime" />
         <result column="farm_id" property="farmId" />
-        <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
     </resultMap>