入场申请

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

@@ -1,9 +1,17 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.BillPersonnelAdmission;
+import com.huimv.admin.service.IBillPersonnelAdmissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,7 +22,41 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-07-21
  */
 @RestController
+@CrossOrigin
 @RequestMapping("/bill-personnel-admission")
 public class BillPersonnelAdmissionController {
+    @Autowired
+    private IBillPersonnelAdmissionService billPersonnelAdmissionService;
+
+    @PostMapping("/addAdmission")
+    public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("admissionType") String admissionType,
+                               @RequestParam("vistitType") String vistitType,
+                               @RequestParam("userName") String userName,
+                               @RequestParam("phone") String phone,
+                               @RequestParam("workName") String workName,
+                               @RequestParam("papersType") String papersType,
+                               @RequestParam("papersCode") String papersCode,
+                               @RequestParam("imgUrl") MultipartFile imgUrl,
+                               @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);
+    }
+
+    @PostMapping("/listPersonalAdmission")
+    public Result listPersonalAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billPersonnelAdmissionService.listPersonalAdmission(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/listAdmission")
+    public Result listAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billPersonnelAdmissionService.listAdmission(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("handleAdmission")
+    public Result handleAdmission (HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPersonnelAdmissionService.handleAdmission(httpServletRequest,paramsMap);
+    }
 
 }

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

@@ -48,7 +48,7 @@ public class BaseLocation implements Serializable {
     */
     private Integer vistitType;
 
-    private Integer lastId;
+    private Integer nextId;
 
 //    private Integer processId;
 

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

@@ -104,5 +104,6 @@ public class BillPcr implements Serializable {
 
     private Integer testLocationId;
 
+    private Integer admissionId;
 
 }

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

@@ -1,7 +1,14 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BillPersonnelAdmission;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 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 listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result handleAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,10 +1,32 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.*;
+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.mapper.BaseLocationMapper;
+import com.huimv.admin.mapper.BaseProcessMapper;
+import com.huimv.admin.mapper.BillPcrMapper;
 import com.huimv.admin.mapper.BillPersonnelAdmissionMapper;
 import com.huimv.admin.service.IBillPersonnelAdmissionService;
 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.web.bind.annotation.PostMapping;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,5 +38,158 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnelAdmissionMapper, BillPersonnelAdmission> implements IBillPersonnelAdmissionService {
+    @Resource
+    private BillPersonnelAdmissionMapper billPersonnelAdmissionMapper;
+    @Resource
+    private BaseProcessMapper baseProcessMapper;
+    @Resource
+    private BillPcrMapper billPcrMapper;
+    @Resource
+    private BaseLocationMapper baseLocationMapper;
+
+    @Autowired
+    private UploadImage uploadImage;
+
+    @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));
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
+            return new Result(10001,"手机号格式错误！",false);
+        }
+        if (papersType.equals("0")){
+            if (!IDCardValidator.isValidIDCard(papersCode)){
+                return new Result(10001,"身份证号格式错误!",false);
+            }
+        }
+        BillPersonnelAdmission billPersonnelAdmission = new BillPersonnelAdmission();
+        billPersonnelAdmission.setAdmissionType(Integer.parseInt(admissionType));
+        billPersonnelAdmission.setVistitType(Integer.parseInt(vistitType));
+        billPersonnelAdmission.setDestId(Integer.parseInt(destId));
+        billPersonnelAdmission.setDestName(destName);
+        billPersonnelAdmission.setAdmissionUserId(userId);
+        billPersonnelAdmission.setAdmissionUserName(userName);
+        billPersonnelAdmission.setVistitDate(LocalDateTime.parse(vistitDate));
+        billPersonnelAdmission.setSubDate(LocalDateTime.now());
+        billPersonnelAdmission.setPhone(phone);
+        billPersonnelAdmission.setWorkName(workName);
+        billPersonnelAdmission.setPapersType(Integer.parseInt(papersType));
+        billPersonnelAdmission.setPapersCode(papersCode);
+        billPersonnelAdmission.setImgUrl(uploadImage.getImageCom(imgUrl));
+        billPersonnelAdmission.setVistitReson(vistitReson);
+        billPersonnelAdmission.setFarmId(farmId);
+        BaseProcess baseProcess = new BaseProcess();
+        baseProcess.setDestName(destName);
+        baseProcess.setDestId(Integer.parseInt(destId));
+        baseProcess.setAdmissionUserId(userId);
+        baseProcess.setAdmissionUserName(userName);
+        baseProcess.setSubDate(DateTime.now());
+        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);
+        baseProcessMapper.insert(baseProcess);
+        billPersonnelAdmission.setProcessId(baseProcess.getId());
+        billPersonnelAdmissionMapper.insert(billPersonnelAdmission);
+        return Result.SUCCESS();
+    }
+
+    @Override
+    public Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page, new QueryWrapper<BillPersonnelAdmission>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date"));
+        return new Result(ResultCode.SUCCESS,billPersonnelAdmissionPage);
+    }
+
+    @Override
+    public Result listAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String type = paramsMap.get("type");
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
+        if (userType == 3){
+            //生物安全负责人
+            queryWrapper.eq("admission_type",0);
+        }else if (userType == 2){
+            //紧急入场
+            queryWrapper.ne("admission_type",0);
+        }
+        switch (type){
+            case "1":
+                queryWrapper.eq("bill_status",0);
+                break;
+            case "2":
+                queryWrapper.eq("bill_status",1);
+                break;
+            case "3":
+                queryWrapper.eq("bill_status",2);
+                break;
+            default: break;
+        }
+        queryWrapper.orderByDesc("sub_date");
+        Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page,queryWrapper);
+        return new Result(ResultCode.SUCCESS,billPersonnelAdmissionPage);
+    }
+
+    @Override
+    @Transactional
+    public Result handleAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String id = paramsMap.get("id");
+        BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
+        Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
+        billPersonnelAdmission.setPassDate(LocalDateTime.now());
+        billPersonnelAdmission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        billPersonnelAdmission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+        BaseProcess baseProcess = baseProcessMapper.selectById(billPersonnelAdmission.getProcessId());
+        if (type.equals("0")){
+            //拒绝
+            billPersonnelAdmission.setBillStatus(2);
+            baseProcess.setProcessType(2);
+        }else {
+            //通过
+            billPersonnelAdmission.setBillStatus(1);
+            //获取pcr位置
+            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());
+            if (userType == 3){
+                BillPcr billPcr = new BillPcr();
+                billPcr.setVistitType(billPersonnelAdmission.getVistitType());
+                billPcr.setDestName(billPersonnelAdmission.getDestName());
+                billPcr.setDestId(billPersonnelAdmission.getDestId());
+                billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
+                billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
+                billPcr.setVistitDate(billPersonnelAdmission.getVistitDate());
+                billPcr.setFarmId(billPersonnelAdmission.getFarmId());
+                billPcr.setProcessId(billPersonnelAdmission.getProcessId());
+                billPcr.setAdmissionId(Integer.parseInt(id));
+                billPcr.setTestLocation(baseLocation.getLocationName());
+                billPcr.setTestLocationId(baseLocation.getId());
+                billPcrMapper.insert(billPcr);
+            }else {
+                //紧急入场通过先不处理
+            }
+        }
+
+
+        return Result.SUCCESS();
+    }
+
 
 }

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

@@ -1,188 +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)){
+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)){
 //                        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.setCreatTime(new Date());
-//                        prodStock.setFarmId(21);
-//                        prodStockService.updateById(prodStock);
-//                    }else {
-//                        prodStock = new ProdStock();
+                        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.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.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(23);
-//                        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(23);
-//                        prodStockService.save(prodStock);
-//                    }
-//
-//                }
-//            }
-//        }
-//    }
-//
-//
-//    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.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();
+    }
+
+}