时间格式化,场长

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

@@ -40,8 +40,9 @@ public class BillPersonnelAdmissionController {
                                @RequestParam("vistitDate") String vistitDate,
                                @RequestParam("vistitReson") String vistitReson,
                                @RequestParam("destId") String destId,
-                               @RequestParam("destName") String destName) throws IOException {
-        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,vistitDate,vistitReson,destId,destName);
+                               @RequestParam("destName") String destName,
+                               @RequestParam("farmId") String farmId) throws IOException {
+        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,vistitDate,vistitReson,destId,destName,farmId);
     }
 
     @PostMapping("/listPersonalAdmission")
@@ -54,9 +55,14 @@ public class BillPersonnelAdmissionController {
         return billPersonnelAdmissionService.listAdmission(httpServletRequest,paramsMap);
     }
 
-    @PostMapping("handleAdmission")
+    @PostMapping("/handleAdmission")
     public Result handleAdmission (HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         return billPersonnelAdmissionService.handleAdmission(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billPersonnelAdmissionService.listAll(httpServletRequest,paramsMap);
+    }
+
 }

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

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -53,6 +54,7 @@ public class BaseProcess implements Serializable {
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private Date subDate;
 
     /**

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,11 +58,13 @@ public class BillClean implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private Integer farmId;
@@ -73,6 +77,7 @@ public class BillClean implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime passDate;
 
     /**

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,11 +58,13 @@ public class BillIsolate implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private Integer farmId;
@@ -100,11 +104,13 @@ public class BillIsolate implements Serializable {
     /**
      * 隔离开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime isolateStartDate;
 
     /**
      * 隔离结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime isolateEndDate;
 
     /**

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -66,11 +68,13 @@ public class BillPcr implements Serializable {
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime checkDate;
 
     /**
@@ -81,6 +85,7 @@ public class BillPcr implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime passDate;
 
     /**

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -61,11 +63,13 @@ public class BillPersonnelAdmission implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     /**
@@ -108,6 +112,7 @@ public class BillPersonnelAdmission implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime passDate;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/vo/FactoryDirectorVo.java

@@ -0,0 +1,28 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.tomcat.jni.Local;
+
+import java.time.LocalDateTime;
+
+@Data
+public class FactoryDirectorVo {
+    private Integer id;
+    private String userName;
+    private Integer billStatus;
+    private String isolateLocation;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime checkDate;
+
+    private String testLocation;
+    private Integer vistitType;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
+    private String destName;
+    private Integer type;
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.java

@@ -2,6 +2,9 @@ package com.huimv.admin.mapper;
 
 import com.huimv.admin.entity.BillPersonnelAdmission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.FactoryDirectorVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAdmission> {
 
+    List<FactoryDirectorVo> listAll(String type, String farmId);
 }

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

@@ -20,11 +20,13 @@ import java.util.Map;
  */
 public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAdmission> {
 
-    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String vistitDate, String vistitReson, String destId, String destName) throws IOException;
+    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String vistitDate, String vistitReson, String destId, String destName, String farmId) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result handleAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -10,6 +10,7 @@ import com.huimv.admin.entity.BaseLocation;
 import com.huimv.admin.entity.BaseProcess;
 import com.huimv.admin.entity.BillPcr;
 import com.huimv.admin.entity.BillPersonnelAdmission;
+import com.huimv.admin.entity.vo.FactoryDirectorVo;
 import com.huimv.admin.mapper.BaseLocationMapper;
 import com.huimv.admin.mapper.BaseProcessMapper;
 import com.huimv.admin.mapper.BillPcrMapper;
@@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,6 +28,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -52,8 +56,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String vistitDate, String vistitReson, String destId, String destName) throws IOException {
-        int farmId = Integer.parseInt(TokenSign.getFarmIds(httpServletRequest));
+    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String vistitDate, String vistitReson, String destId, String destName,String farmId) throws IOException {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001,"手机号格式错误！",false);
@@ -63,6 +66,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 return new Result(10001,"身份证号格式错误!",false);
             }
         }
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         BillPersonnelAdmission billPersonnelAdmission = new BillPersonnelAdmission();
         billPersonnelAdmission.setAdmissionType(Integer.parseInt(admissionType));
         billPersonnelAdmission.setVistitType(Integer.parseInt(vistitType));
@@ -70,27 +74,32 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setDestName(destName);
         billPersonnelAdmission.setAdmissionUserId(userId);
         billPersonnelAdmission.setAdmissionUserName(userName);
-        billPersonnelAdmission.setVistitDate(LocalDateTime.parse(vistitDate));
+        billPersonnelAdmission.setVistitDate(LocalDateTime.parse(vistitDate,dateTimeFormatter));
         billPersonnelAdmission.setSubDate(LocalDateTime.now());
         billPersonnelAdmission.setPhone(phone);
         billPersonnelAdmission.setWorkName(workName);
         billPersonnelAdmission.setPapersType(Integer.parseInt(papersType));
         billPersonnelAdmission.setPapersCode(papersCode);
+        if (uploadImage.getImageCom(imgUrl).equals("上传失败")) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001,"图片上传失败",false);
+        }
         billPersonnelAdmission.setImgUrl(uploadImage.getImageCom(imgUrl));
         billPersonnelAdmission.setVistitReson(vistitReson);
-        billPersonnelAdmission.setFarmId(farmId);
+        billPersonnelAdmission.setFarmId(Integer.parseInt(farmId));
         BaseProcess baseProcess = new BaseProcess();
         baseProcess.setDestName(destName);
         baseProcess.setDestId(Integer.parseInt(destId));
         baseProcess.setAdmissionUserId(userId);
         baseProcess.setAdmissionUserName(userName);
         baseProcess.setSubDate(DateTime.now());
+        baseProcess.setUpdateDate(DateTime.now().toString());
         baseProcess.setCurrentStatus("0");
         //获取位置
         BaseLocation baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("parent_id", 0));
         baseProcess.setCurrentLocation(baseLocation.getLocationName());
         baseProcess.setCurrentLocationId(baseLocation.getId().toString());
-        baseProcess.setFarmId(farmId);
+        baseProcess.setFarmId(Integer.parseInt(farmId));
         baseProcessMapper.insert(baseProcess);
         billPersonnelAdmission.setProcessId(baseProcess.getId());
         billPersonnelAdmissionMapper.insert(billPersonnelAdmission);
@@ -111,6 +120,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         String type = paramsMap.get("type");
+        String farmId = paramsMap.get("farmId");
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
         Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
         if (userType == 3){
@@ -132,7 +142,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 break;
             default: break;
         }
-        queryWrapper.orderByDesc("sub_date");
+        queryWrapper.orderByDesc("sub_date").eq("farm_id",farmId);
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page,queryWrapper);
         return new Result(ResultCode.SUCCESS,billPersonnelAdmissionPage);
@@ -143,12 +153,19 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result handleAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String id = paramsMap.get("id");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
-        Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
+//        Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
+        Integer userType = 3;
         billPersonnelAdmission.setPassDate(LocalDateTime.now());
         billPersonnelAdmission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billPersonnelAdmission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
         BaseProcess baseProcess = baseProcessMapper.selectById(billPersonnelAdmission.getProcessId());
+        if (StringUtils.isBlank(baseProcess.getUpdateDate())){
+            baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
+        }else {
+            baseProcess.setUpdateDate(baseProcess.getUpdateDate()+","+LocalDateTime.now().format(dateTimeFormatter));
+        }
         if (type.equals("0")){
             //拒绝
             billPersonnelAdmission.setBillStatus(2);
@@ -160,11 +177,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String laseLocationId = baseProcess.getCurrentLocationId();
             BaseLocation laseLocation = baseLocationMapper.selectById(laseLocationId);
             BaseLocation baseLocation = baseLocationMapper.selectById(laseLocation.getNextId());
-            if (StringUtils.isBlank(baseProcess.getUpdateDate())){
-                baseProcess.setUpdateDate(LocalDateTime.now().toString());
-            }else {
-                baseProcess.setUpdateDate(baseProcess.getUpdateDate()+","+LocalDateTime.now().toString());
-            }
             baseProcess.setCurrentStatus("1,0");
             baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
             baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
@@ -175,6 +187,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billPcr.setDestId(billPersonnelAdmission.getDestId());
                 billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
                 billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
+                billPcr.setSubDate(LocalDateTime.now());
                 billPcr.setVistitDate(billPersonnelAdmission.getVistitDate());
                 billPcr.setFarmId(billPersonnelAdmission.getFarmId());
                 billPcr.setProcessId(billPersonnelAdmission.getProcessId());
@@ -183,13 +196,20 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billPcr.setTestLocationId(baseLocation.getId());
                 billPcrMapper.insert(billPcr);
             }else {
-                //紧急入场通过先不处理
+                //TODO 紧急入场通过先不处理
             }
         }
-
-
+        baseProcessMapper.updateById(baseProcess);
+        billPersonnelAdmissionMapper.updateById(billPersonnelAdmission);
         return Result.SUCCESS();
     }
 
+    @Override
+    public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String farmId = paramsMap.get("farmId");
+        List<FactoryDirectorVo> factoryDirectorList = billPersonnelAdmissionMapper.listAll(type,farmId);
+        return new Result(ResultCode.SUCCESS,factoryDirectorList);
+    }
 
 }

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

@@ -1,198 +1,198 @@
-package com.huimv.admin.timer;
-
-
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.admin.common.utils.Digests;
-import com.huimv.admin.common.utils.HttpClientSSLUtils;
-import com.huimv.admin.entity.*;
-import com.huimv.admin.entity.zengxindto.*;
-import com.huimv.admin.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.*;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.client.RestTemplate;
-
-import java.time.LocalDate;
-import java.util.*;
-
-@Configuration
-@EnableScheduling
-public class ShenChanTimer {
-
-    //生产数据
-    @Autowired
-    private RestTemplate restTemplate;
-    @Autowired
-    private IProdStockService prodStockService;
-
-
-    @Scheduled(cron = "0 0 */4 * * ? ")
-//    @Scheduled(cron = "0 * * * * ?")
-    @GetMapping("/test")
-    private void getShenChan() throws Exception {
-        Integer farmId = 21;
-        List<Integer> farmIds = new ArrayList();
-        farmIds.add(21);
-        farmIds.add(23);
-        farmIds.add(24);
-        String time = LocalDate.now().toString();
-        String token = login();
-//        System.out.println("token"+token);
-        DateTime dateTime = DateUtil.beginOfDay(new Date());
-        System.out.println(token);
-
-        String url = "http://test.htpig.cn/rest/db/storedproc";
-        Map<String, Object> map = new HashMap<String, Object>();
-        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();
-        maps.put("name","@fdate");
-        maps.put("value",time);
-        list.add(maps);
-
-        map.put("params",list);
-        String params = JSON.toJSONString(map);
-        System.out.println(" ====== getStock请求参数：【" + params + "】");
-        String data = HttpClientSSLUtils.doPost(url+"?token="+token+"&data=", params);
-        ProdStockDto prodStockDto = JSONUtil.toBean(data, ProdStockDto.class);
-        List<List<Object>> stockData = prodStockDto.getData();
-        System.out.println(prodStockDto.toString());
-        for (Integer id : farmIds) {
-            ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().ge("creat_time",dateTime).eq("farm_id", id).orderByDesc("creat_time").last("limit 1"));
-
-            for (List stock : stockData) {
-                if ("正康".equals(stock.get(0))){
-                    if (ObjectUtil.isNotEmpty(prodStock)){
-                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                        prodStock.setCreatTime(new Date());
-                        prodStock.setFarmId(21);
-                        prodStockService.updateById(prodStock);
-                    }else {
-                        prodStock = new ProdStock();
-                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                        prodStock.setMzcl(100);
-                        prodStock.setGzcl(200);
-                        prodStock.setBrzcl(452);
-                        prodStock.setHbzcl(100);
-                        prodStock.setRszcl(30);
-                        prodStock.setBrmzcl(20);
-                        prodStock.setKhzcl(212);
-                        prodStock.setSpzcl(1020);
-                        prodStock.setCreatTime(new Date());
-                        prodStock.setFarmId(21);
-                        prodStockService.save(prodStock);
-                    }
-
-                }
-
-                if ("东阳".equals(stock.get(0))){
-                    if (ObjectUtil.isNotEmpty(prodStock)){
-//                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                        prodStock.setZzcl(5433);
-//                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                        prodStock.setByzcl(6760);
-//                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                        prodStock.setYfzcl(4361);
-//                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                        prodStock.setZcl(16554);
-                        prodStock.setCreatTime(new Date());
-                        prodStock.setFarmId(24);
-                        prodStockService.updateById(prodStock);
-                        System.out.println("东阳--》");
-                    }else {
-                        prodStock = new ProdStock();
-                        //                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                        prodStock.setZzcl(5433);
-//                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                        prodStock.setByzcl(6760);
-//                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                        prodStock.setYfzcl(4361);
-//                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                        prodStock.setZcl(16554);
-                        prodStock.setMzcl(100);
-                        prodStock.setGzcl(200);
-                        prodStock.setBrzcl(452);
-                        prodStock.setHbzcl(100);
-                        prodStock.setRszcl(30);
-                        prodStock.setBrmzcl(20);
-                        prodStock.setKhzcl(212);
-                        prodStock.setSpzcl(1020);
-                        prodStock.setCreatTime(new Date());
-                        prodStock.setFarmId(24);
-                        prodStockService.save(prodStock);
-                        System.out.println("东阳");
-                    }
-                }
-                if ("浦江".equals(stock.get(0))){
-                    if (ObjectUtil.isNotEmpty(prodStock)){
+//package com.huimv.admin.timer;
+//
+//
+//import cn.hutool.core.codec.Base64;
+//import cn.hutool.core.date.DateTime;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.ObjectUtil;
+//import cn.hutool.json.JSONObject;
+//import cn.hutool.json.JSONUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+//import com.huimv.admin.common.utils.Digests;
+//import com.huimv.admin.common.utils.HttpClientSSLUtils;
+//import com.huimv.admin.entity.*;
+//import com.huimv.admin.entity.zengxindto.*;
+//import com.huimv.admin.service.*;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.http.*;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.client.RestTemplate;
+//
+//import java.time.LocalDate;
+//import java.util.*;
+//
+//@Configuration
+//@EnableScheduling
+//public class ShenChanTimer {
+//
+//    //生产数据
+//    @Autowired
+//    private RestTemplate restTemplate;
+//    @Autowired
+//    private IProdStockService prodStockService;
+//
+//
+//    @Scheduled(cron = "0 0 */4 * * ? ")
+////    @Scheduled(cron = "0 * * * * ?")
+//    @GetMapping("/test")
+//    private void getShenChan() throws Exception {
+//        Integer farmId = 21;
+//        List<Integer> farmIds = new ArrayList();
+//        farmIds.add(21);
+//        farmIds.add(23);
+//        farmIds.add(24);
+//        String time = LocalDate.now().toString();
+//        String token = login();
+////        System.out.println("token"+token);
+//        DateTime dateTime = DateUtil.beginOfDay(new Date());
+//        System.out.println(token);
+//
+//        String url = "http://test.htpig.cn/rest/db/storedproc";
+//        Map<String, Object> map = new HashMap<String, Object>();
+//        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();
+//        maps.put("name","@fdate");
+//        maps.put("value",time);
+//        list.add(maps);
+//
+//        map.put("params",list);
+//        String params = JSON.toJSONString(map);
+//        System.out.println(" ====== getStock请求参数：【" + params + "】");
+//        String data = HttpClientSSLUtils.doPost(url+"?token="+token+"&data=", params);
+//        ProdStockDto prodStockDto = JSONUtil.toBean(data, ProdStockDto.class);
+//        List<List<Object>> stockData = prodStockDto.getData();
+//        System.out.println(prodStockDto.toString());
+//        for (Integer id : farmIds) {
+//            ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().ge("creat_time",dateTime).eq("farm_id", id).orderByDesc("creat_time").last("limit 1"));
+//
+//            for (List stock : stockData) {
+//                if ("正康".equals(stock.get(0))){
+//                    if (ObjectUtil.isNotEmpty(prodStock)){
 //                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                        prodStock.setZzcl(9980);
 //                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                        prodStock.setByzcl(16384);
 //                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                        prodStock.setYfzcl(32999);
 //                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                        prodStock.setZcl(66381);
-                        prodStock.setCreatTime(new Date());
-                        prodStock.setFarmId(23);
-                        prodStockService.updateById(prodStock);
-                        System.out.println("浦江--》");
-                    }else {
-                        prodStock = new ProdStock();
+//                        prodStock.setCreatTime(new Date());
+//                        prodStock.setFarmId(21);
+//                        prodStockService.updateById(prodStock);
+//                    }else {
+//                        prodStock = new ProdStock();
 //                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                        prodStock.setZzcl(9980);
 //                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                        prodStock.setByzcl(16384);
 //                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                        prodStock.setYfzcl(32999);
 //                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                        prodStock.setZcl(66381);
-                        prodStock.setMzcl(100);
-                        prodStock.setGzcl(200);
-                        prodStock.setBrzcl(452);
-                        prodStock.setHbzcl(100);
-                        prodStock.setRszcl(30);
-                        prodStock.setBrmzcl(20);
-                        prodStock.setKhzcl(212);
-                        prodStock.setSpzcl(1020);
-                        prodStock.setCreatTime(new Date());
-                        prodStock.setFarmId(23);
-                        prodStockService.save(prodStock);
-                        System.out.println("浦江--》");
-                    }
-
-                }
-            }
-        }
-    }
-
-
-    private String login() throws Exception {
-        StockLoginDto stockLoginDto = restTemplate.getForObject("http://test.htpig.cn/rest/user/login?user_name=test&password=e10adc3949ba59abbe56e057f20f883e&db_name=MSSQL", StockLoginDto.class);
-        if (stockLoginDto.getStatus() != 0){
-            return null;
-        }
-        return stockLoginDto.getToken();
-    }
-
-}
+//                        prodStock.setMzcl(100);
+//                        prodStock.setGzcl(200);
+//                        prodStock.setBrzcl(452);
+//                        prodStock.setHbzcl(100);
+//                        prodStock.setRszcl(30);
+//                        prodStock.setBrmzcl(20);
+//                        prodStock.setKhzcl(212);
+//                        prodStock.setSpzcl(1020);
+//                        prodStock.setCreatTime(new Date());
+//                        prodStock.setFarmId(21);
+//                        prodStockService.save(prodStock);
+//                    }
+//
+//                }
+//
+//                if ("东阳".equals(stock.get(0))){
+//                    if (ObjectUtil.isNotEmpty(prodStock)){
+////                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+//                        prodStock.setZzcl(5433);
+////                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+//                        prodStock.setByzcl(6760);
+////                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+//                        prodStock.setYfzcl(4361);
+////                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+//                        prodStock.setZcl(16554);
+//                        prodStock.setCreatTime(new Date());
+//                        prodStock.setFarmId(24);
+//                        prodStockService.updateById(prodStock);
+//                        System.out.println("东阳--》");
+//                    }else {
+//                        prodStock = new ProdStock();
+//                        //                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+//                        prodStock.setZzcl(5433);
+////                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+//                        prodStock.setByzcl(6760);
+////                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+//                        prodStock.setYfzcl(4361);
+////                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+//                        prodStock.setZcl(16554);
+//                        prodStock.setMzcl(100);
+//                        prodStock.setGzcl(200);
+//                        prodStock.setBrzcl(452);
+//                        prodStock.setHbzcl(100);
+//                        prodStock.setRszcl(30);
+//                        prodStock.setBrmzcl(20);
+//                        prodStock.setKhzcl(212);
+//                        prodStock.setSpzcl(1020);
+//                        prodStock.setCreatTime(new Date());
+//                        prodStock.setFarmId(24);
+//                        prodStockService.save(prodStock);
+//                        System.out.println("东阳");
+//                    }
+//                }
+//                if ("浦江".equals(stock.get(0))){
+//                    if (ObjectUtil.isNotEmpty(prodStock)){
+////                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+//                        prodStock.setZzcl(9980);
+////                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+//                        prodStock.setByzcl(16384);
+////                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+//                        prodStock.setYfzcl(32999);
+////                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+//                        prodStock.setZcl(66381);
+//                        prodStock.setCreatTime(new Date());
+//                        prodStock.setFarmId(23);
+//                        prodStockService.updateById(prodStock);
+//                        System.out.println("浦江--》");
+//                    }else {
+//                        prodStock = new ProdStock();
+////                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+//                        prodStock.setZzcl(9980);
+////                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+//                        prodStock.setByzcl(16384);
+////                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+//                        prodStock.setYfzcl(32999);
+////                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+//                        prodStock.setZcl(66381);
+//                        prodStock.setMzcl(100);
+//                        prodStock.setGzcl(200);
+//                        prodStock.setBrzcl(452);
+//                        prodStock.setHbzcl(100);
+//                        prodStock.setRszcl(30);
+//                        prodStock.setBrmzcl(20);
+//                        prodStock.setKhzcl(212);
+//                        prodStock.setSpzcl(1020);
+//                        prodStock.setCreatTime(new Date());
+//                        prodStock.setFarmId(23);
+//                        prodStockService.save(prodStock);
+//                        System.out.println("浦江--》");
+//                    }
+//
+//                }
+//            }
+//        }
+//    }
+//
+//
+//    private String login() throws Exception {
+//        StockLoginDto stockLoginDto = restTemplate.getForObject("http://test.htpig.cn/rest/user/login?user_name=test&password=e10adc3949ba59abbe56e057f20f883e&db_name=MSSQL", StockLoginDto.class);
+//        if (stockLoginDto.getStatus() != 0){
+//            return null;
+//        }
+//        return stockLoginDto.getToken();
+//    }
+//
+//}

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

@@ -26,5 +26,24 @@
         <result column="pass_user_id" property="passUserId" />
         <result column="process_id" property="processId" />
     </resultMap>
+    <select id="listAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
+        SELECT id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS check_date, NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type'
+FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type'
+FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type}
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, NULL, NULL, NULL,1 AS 'type'
+FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = #{type}
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName', bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type'
+FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
+    </select>
 
 </mapper>