v3项目-修改0915-1

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDivideCircleController.java

@@ -78,4 +78,11 @@ public class JsDivideCircleController {
     public AjaxResult review() {
         return success(divideCircleService.review());
     }
+
+    @ApiOperation("查询分圈后有效批次号列表")
+    @GetMapping("/listSeries")
+    public AjaxResult series() {
+        return success(divideCircleService.listSeriesNo());
+    }
+
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/model/vo/CircleVo.java

@@ -0,0 +1,28 @@
+package com.ruoyi.web.v2.v1.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+public class CircleVo implements Serializable {
+
+    @ApiModelProperty(value = "供应商")
+    private String supplierName;
+
+    @ApiModelProperty(value = "检疫证号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "待宰圈号")
+    private String pigpenName;
+
+    @ApiModelProperty(value = "入场日期")
+    private LocalDate entranceDate;
+
+    @ApiModelProperty(value = "批次id")
+    private Integer entranceBatchId;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDivideCircleService.java

@@ -25,4 +25,6 @@ public interface IJsDivideCircleService extends IService<JsDivideCircle> {
     AjaxResult listAll(String startTime);
 
     AjaxResult review();
+
+    AjaxResult listSeriesNo();
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDivideCircleServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.v2.v1.model.JsDivideCircle;
 import com.ruoyi.web.v2.v1.mapper.JsDivideCircleMapper;
+import com.ruoyi.web.v2.v1.model.vo.CircleVo;
 import com.ruoyi.web.v2.v1.service.IJsDivideCircleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +23,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.core.domain.AjaxResult.error;
 import static com.ruoyi.common.core.domain.AjaxResult.success;
@@ -214,4 +219,34 @@ public class JsDivideCircleServiceImpl extends ServiceImpl<JsDivideCircleMapper,
         return success(circles);
     }
 
+    @Override
+    public AjaxResult listSeriesNo() {
+        AjaxResult circleList = review();
+        List<CircleVo> circleVoList = new ArrayList<>();
+        if(!ObjectUtils.isEmpty(circleList) &&
+                !ObjectUtils.isEmpty(circleList.getOrDefault(AjaxResult.DATA_TAG, null))) {
+            List<JsDivideCircle> circles = (List<JsDivideCircle>) circleList.get(AjaxResult.DATA_TAG);
+            for(JsDivideCircle circle : circles) {
+                CircleVo circleVo = new CircleVo();
+                circleVo.setSupplierName(circle.getSupplierName());
+                circleVo.setAnimalCertNo(circle.getAnimalCertNo());
+                circleVo.setPigpenName(circle.getPigpenName());
+                try {
+                    if(!ObjectUtils.isEmpty(circle.getSeriesNo())) {
+                        circleVo.setEntranceDate(LocalDate.parse(
+                                circle.getSeriesNo().substring(13), DateTimeFormatter.ofPattern("yyyyMMdd")));
+                    }
+                }catch (Exception e) {
+                    log.warn(String.format("处理入场日期出现异常：seriesNo -> %s", circle.getSeriesNo()));
+                }
+                circleVo.setEntranceBatchId(circle.getEntranceBatchId());
+                circleVoList.add(circleVo);
+            }
+        }
+
+        return success(circleVoList.stream().filter(vo -> vo.getEntranceBatchId() != null)
+                .sorted(Comparator.comparing(CircleVo::getEntranceBatchId).reversed())
+                .collect(Collectors.toList()));
+    }
+
 }

app-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://122.112.224.199:3306/huimv-hebei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://122.112.224.199:3306/huimv-hebei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/huimv-hebei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: hm123456
+#                password: hm123456
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

app-admin/src/main/resources/application.yml

@@ -146,7 +146,7 @@ xss:
 # MyBatis Plus配置
 mybatis-plus:
   # 搜索指定包别名
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: com.ruoyi.**.model;com.ruoyi.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件