瀏覽代碼

新建展示列表代码,
新建获取任务号代码

zhuoning 3 年之前
父節點
當前提交
d777be870d
共有 23 個文件被更改,包括 1360 次插入53 次删除
  1. 43 0
      huimv-manage/pom.xml
  2. 2 0
      huimv-manage/src/main/java/com/huimv/manage/ManageApplication.java
  3. 91 0
      huimv-manage/src/main/java/com/huimv/manage/controller/ApplyController.java
  4. 0 51
      huimv-manage/src/main/java/com/huimv/manage/controller/TaskController.java
  5. 298 0
      huimv-manage/src/main/java/com/huimv/manage/dao/entity/EtApplyEntity.java
  6. 14 0
      huimv-manage/src/main/java/com/huimv/manage/dao/repo/EtApplyRepo.java
  7. 24 0
      huimv-manage/src/main/java/com/huimv/manage/exception/APIException.java
  8. 53 0
      huimv-manage/src/main/java/com/huimv/manage/exception/GlobalExceptionHandler.java
  9. 23 0
      huimv-manage/src/main/java/com/huimv/manage/exception/ResultCode.java
  10. 31 0
      huimv-manage/src/main/java/com/huimv/manage/exception/ResultVO.java
  11. 15 0
      huimv-manage/src/main/java/com/huimv/manage/service/IApplyService.java
  12. 85 0
      huimv-manage/src/main/java/com/huimv/manage/service/impl/ApplyServiceImpl.java
  13. 15 0
      huimv-manage/src/main/java/com/huimv/manage/util/Const.java
  14. 79 0
      huimv-manage/src/main/java/com/huimv/manage/util/Result.java
  15. 41 0
      huimv-manage/src/main/java/com/huimv/manage/util/ResultCode.java
  16. 38 0
      huimv-manage/src/main/java/com/huimv/manage/util/result1/DemoErrors.java
  17. 120 0
      huimv-manage/src/main/java/com/huimv/manage/util/result1/Result1.java
  18. 25 0
      huimv-manage/src/main/java/com/huimv/manage/util/result1/ServiceErrors.java
  19. 92 0
      huimv-manage/src/main/java/com/huimv/manage/webservice/Soap.java
  20. 200 0
      huimv-manage/src/main/java/com/huimv/manage/webservice/task/NewProduceMission.java
  21. 18 1
      huimv-manage/src/main/resources/application-dev.yml
  22. 15 1
      huimv-manage/src/main/resources/application.properties
  23. 38 0
      huimv-manage/src/test/java/com/huimv/manage/controller/ApplyTest.java

+ 43 - 0
huimv-manage/pom.xml

@@ -148,6 +148,49 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.73</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.10</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>apache-log4j-extras</artifactId>
+            <version>1.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>9.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 2 - 0
huimv-manage/src/main/java/com/huimv/manage/ManageApplication.java

@@ -2,8 +2,10 @@ package com.huimv.manage;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootApplication
+@EnableJpaAuditing
 public class ManageApplication {
 
     public static void main(String[] args) {

+ 91 - 0
huimv-manage/src/main/java/com/huimv/manage/controller/ApplyController.java

@@ -0,0 +1,91 @@
+package com.huimv.manage.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.manage.service.IApplyService;
+import com.huimv.manage.util.Result;
+import com.huimv.manage.util.ResultCode;
+import com.huimv.manage.webservice.Soap;
+import com.huimv.manage.webservice.task.NewProduceMission;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@CrossOrigin
+@RestController
+@Slf4j
+@RequestMapping(value = "/apply")
+public class ApplyController {
+    @Value("${webservice.url}")
+    private String webServiceUrl;
+    @Value("${webservice.producerId}")
+    private String producerId;
+    @Autowired
+    private IApplyService applyService;
+    @Autowired
+    private Soap soap;
+    @Autowired
+    private NewProduceMission newProduceMission;
+
+    /**
+     * @Method      : listTask
+     * @Description : 
+     * @Params      : []
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/10/27       
+     * @Time        : 20:28
+     */
+    @RequestMapping(value = "/listApply",method = RequestMethod.GET)
+    public Result listApply(){
+        return applyService.listApply();
+    }
+
+    /**
+     * @Method      : getNewTask
+     * @Description : 
+     * @Params      : []
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/10/27       
+     * @Time        : 20:29
+     */
+    @RequestMapping(value = "/getNewApply",method = RequestMethod.GET)
+    public Result getNewTask() throws UnsupportedEncodingException {
+        log.info("producerId>>"+producerId);
+        log.info("webServiceUrl>>"+webServiceUrl);
+        //
+//        JSONArray applyJa = newProduceMission.parseApplyXML(soap.callSoap(newProduceMission.getNewMissionText(producerId),webServiceUrl));
+        //
+        JSONArray applyJa = newProduceMission.parseApplyXML(newProduceMission.getNewMessionResult());
+        if(applyJa.size() > 0){
+            System.out.println("获取任务号:"+applyJa.size());
+            for(int a=0;a<applyJa.size();a++){
+                JSONObject applyJo = applyJa.getJSONObject(a);
+                System.out.println(applyJo);
+            }
+            // 保存新任务(号)
+            return applyService.saveNewMission(applyJa);
+        }else{
+            return new Result(ResultCode.SUCCESS,"目前暂无新任务.");
+        }
+    }
+
+
+}

+ 0 - 51
huimv-manage/src/main/java/com/huimv/manage/controller/TaskController.java

@@ -1,51 +0,0 @@
-package com.huimv.manage.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Project : huimv.shiwan
- * @Package : com.huimv.biosafety.uface.controller
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2020-12-25
- **/
-@RestController
-@RequestMapping(value = "/task")
-public class TaskController {
-
-    /**
-     * @Method      : listTask
-     * @Description : 
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/10/27       
-     * @Time        : 20:28
-     */
-    @RequestMapping(value = "listTask",method = RequestMethod.GET)
-    public String listTask(){
-
-        return "";
-    }
-
-    /**
-     * @Method      : getNewTask
-     * @Description : 
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/10/27       
-     * @Time        : 20:29
-     */
-    @RequestMapping(value = "getNewTask",method = RequestMethod.GET)
-    public String getNewTask(){
-        return "";
-    }
-
-
-}

+ 298 - 0
huimv-manage/src/main/java/com/huimv/manage/dao/entity/EtApplyEntity.java

@@ -0,0 +1,298 @@
+package com.huimv.manage.dao.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Date;
+import java.sql.Timestamp;
+
+@EntityListeners(AuditingEntityListener.class)
+@Entity
+@Table(name = "et_apply")
+public class EtApplyEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+//    @CreatedDate
+//    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Column(name = "download_time")
+    private Timestamp downloadTime;
+
+    @Column(name = "mission_processor")
+    private String missionProcessor;
+
+    @Column(name = "org_id")
+    private String orgId;
+
+    @Column(name = "org_name")
+    private String orgName;
+
+    @Column(name = "org_address")
+    private String orgAddress;
+
+    @Column(name = "org_linkman")
+    private String orgLinkman;
+
+    @Column(name = "post_code")
+    private String postCode;
+
+    @Column(name = "org_tel")
+    private String orgTel;
+
+    @Column(name = "apply_id")
+    private Integer applyId;
+
+    @Column(name = "assigned_date")
+    private String assignedDate;
+
+    @Column(name = "earmark_amount")
+    private Integer earmarkAmount;
+
+    @Column(name = "real_earmark_amount")
+    private Integer realEarmarkAmount;
+
+    @Column(name = "consignment_date")
+    private String consignmentDate;
+
+    @Column(name = "apply_region_name")
+    private String applyRegionName;
+
+    @Column(name = "animal_type")
+    private String animalType;
+
+    @Column(name = "animal_type_name")
+    private String animalTypeName;
+
+    @Column(name = "set_down_state")
+    private Integer setDownState;
+
+//    @CreatedDate
+//    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Column(name = "set_down_date")
+    private Timestamp setDownDate;
+
+    @Column(name = "deliver_state")
+    private Integer deliverState;
+
+//    @CreatedDate
+//    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Column(name = "deliver_date")
+    private Date deliverDate;
+
+//    @CreatedDate
+//    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Column(name = "commit_time")
+    private Timestamp commitTime;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setDownloadTime(Timestamp downloadTime) {
+        this.downloadTime = downloadTime;
+    }
+
+    public Timestamp getDownloadTime() {
+        return downloadTime;
+    }
+
+    public void setMissionProcessor(String missionProcessor) {
+        this.missionProcessor = missionProcessor;
+    }
+
+    public String getMissionProcessor() {
+        return missionProcessor;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgAddress(String orgAddress) {
+        this.orgAddress = orgAddress;
+    }
+
+    public String getOrgAddress() {
+        return orgAddress;
+    }
+
+    public void setOrgLinkman(String orgLinkman) {
+        this.orgLinkman = orgLinkman;
+    }
+
+    public String getOrgLinkman() {
+        return orgLinkman;
+    }
+
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
+    }
+
+    public String getPostCode() {
+        return postCode;
+    }
+
+    public void setOrgTel(String orgTel) {
+        this.orgTel = orgTel;
+    }
+
+    public String getOrgTel() {
+        return orgTel;
+    }
+
+    public void setApplyId(Integer applyId) {
+        this.applyId = applyId;
+    }
+
+    public Integer getApplyId() {
+        return applyId;
+    }
+
+    public void setAssignedDate(String assignedDate) {
+        this.assignedDate = assignedDate;
+    }
+
+    public String getAssignedDate() {
+        return assignedDate;
+    }
+
+    public void setEarmarkAmount(Integer earmarkAmount) {
+        this.earmarkAmount = earmarkAmount;
+    }
+
+    public Integer getEarmarkAmount() {
+        return earmarkAmount;
+    }
+
+    public void setRealEarmarkAmount(Integer realEarmarkAmount) {
+        this.realEarmarkAmount = realEarmarkAmount;
+    }
+
+    public Integer getRealEarmarkAmount() {
+        return realEarmarkAmount;
+    }
+
+    public void setConsignmentDate(String consignmentDate) {
+        this.consignmentDate = consignmentDate;
+    }
+
+    public String getConsignmentDate() {
+        return consignmentDate;
+    }
+
+    public void setApplyRegionName(String applyRegionName) {
+        this.applyRegionName = applyRegionName;
+    }
+
+    public String getApplyRegionName() {
+        return applyRegionName;
+    }
+
+    public void setAnimalType(String animalType) {
+        this.animalType = animalType;
+    }
+
+    public String getAnimalType() {
+        return animalType;
+    }
+
+    public void setAnimalTypeName(String animalTypeName) {
+        this.animalTypeName = animalTypeName;
+    }
+
+    public String getAnimalTypeName() {
+        return animalTypeName;
+    }
+
+    public void setSetDownState(Integer setDownState) {
+        this.setDownState = setDownState;
+    }
+
+    public Integer getSetDownState() {
+        return setDownState;
+    }
+
+    public void setSetDownDate(Timestamp setDownDate) {
+        this.setDownDate = setDownDate;
+    }
+
+    public Timestamp getSetDownDate() {
+        return setDownDate;
+    }
+
+    public void setDeliverState(Integer deliverState) {
+        this.deliverState = deliverState;
+    }
+
+    public Integer getDeliverState() {
+        return deliverState;
+    }
+
+    public void setDeliverDate(Date deliverDate) {
+        this.deliverDate = deliverDate;
+    }
+
+    public Date getDeliverDate() {
+        return deliverDate;
+    }
+
+    public void setCommitTime(Timestamp commitTime) {
+        this.commitTime = commitTime;
+    }
+
+    public Timestamp getCommitTime() {
+        return commitTime;
+    }
+
+    @Override
+    public String toString() {
+        return "EtApplyEntity{" +
+                "id=" + id + '\'' +
+                "downloadTime=" + downloadTime + '\'' +
+                "missionProcessor=" + missionProcessor + '\'' +
+                "orgId=" + orgId + '\'' +
+                "orgName=" + orgName + '\'' +
+                "orgAddress=" + orgAddress + '\'' +
+                "orgLinkman=" + orgLinkman + '\'' +
+                "postCode=" + postCode + '\'' +
+                "orgTel=" + orgTel + '\'' +
+                "applyId=" + applyId + '\'' +
+                "assignedDate=" + assignedDate + '\'' +
+                "earmarkAmount=" + earmarkAmount + '\'' +
+                "realEarmarkAmount=" + realEarmarkAmount + '\'' +
+                "consignmentDate=" + consignmentDate + '\'' +
+                "applyRegionName=" + applyRegionName + '\'' +
+                "animalType=" + animalType + '\'' +
+                "animalTypeName=" + animalTypeName + '\'' +
+                "setDownState=" + setDownState + '\'' +
+                "setDownDate=" + setDownDate + '\'' +
+                "deliverState=" + deliverState + '\'' +
+                "deliverDate=" + deliverDate + '\'' +
+                "commitTime=" + commitTime + '\'' +
+                '}';
+    }
+}

+ 14 - 0
huimv-manage/src/main/java/com/huimv/manage/dao/repo/EtApplyRepo.java

@@ -0,0 +1,14 @@
+package com.huimv.manage.dao.repo;
+
+import com.huimv.manage.dao.entity.EtApplyEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface EtApplyRepo extends JpaRepository<EtApplyEntity, Integer>, JpaSpecificationExecutor<EtApplyEntity> {
+    //
+    @Query(nativeQuery = true , value = "SELECT * FROM et_apply ORDER BY id DESC")
+    List<EtApplyEntity> listApply();
+}

+ 24 - 0
huimv-manage/src/main/java/com/huimv/manage/exception/APIException.java

@@ -0,0 +1,24 @@
+package com.huimv.manage.exception;
+
+import lombok.Getter;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Getter
+public class APIException extends RuntimeException{
+    private int code;
+    private String msg;
+    public APIException() {
+        this(ResultCode.FAILED);
+    }
+    public APIException(ResultCode failed) {
+        this.code=failed.getCode();
+        this.msg=failed.getMsg();
+    }
+}

+ 53 - 0
huimv-manage/src/main/java/com/huimv/manage/exception/GlobalExceptionHandler.java

@@ -0,0 +1,53 @@
+package com.huimv.manage.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RestControllerAdvice
+@Slf4j
+public class GlobalExceptionHandler {
+    /**
+     * 自定义异常APIException
+     */
+    @ExceptionHandler(APIException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResultVO<Object> APIExceptionHandler(APIException e) {
+        log.error("api异常");
+        return  new ResultVO<>(ResultCode.FAILED, e.getMsg());
+    }
+
+    /**
+     * 方法参数错误异常
+     * @param e
+     * @return
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResultVO<Object> MethodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) {
+        log.error("方法参数错误异常");
+        List<String> list=new ArrayList<>();        // 从异常对象中拿到ObjectError对象
+        if (!e.getBindingResult().getAllErrors().isEmpty()){
+            for(ObjectError error:e.getBindingResult().getAllErrors()){
+                list.add(error.getDefaultMessage().toString());
+            }
+        }
+        // 然后提取错误提示信息进行返回
+        return new ResultVO<>(ResultCode.VALIDATE_FAILED, list);
+    }
+}

+ 23 - 0
huimv-manage/src/main/java/com/huimv/manage/exception/ResultCode.java

@@ -0,0 +1,23 @@
+package com.huimv.manage.exception;
+
+
+import lombok.Getter;
+/**
+ * @author suruomo
+ * @date 2020/8/7 16:10
+ * @description: 响应码枚举
+ */
+@Getter
+public enum ResultCode {
+    //1000系列通用错误
+    SUCCESS(1000, "操作成功"),
+    FAILED(1001, "接口错误"),
+    VALIDATE_FAILED(1002, "参数校验失败"),
+    ERROR(1003, "未知错误"),
+    //2000系列用户错误
+    USER_NOT_EXIST(2000,"用户不存在"),
+    USER_LOGIN_FAIL(2001,"用户名或密码错误"),
+    USER_NOT_LOGIN(2002,"用户还未登录,请先登录"),
+    NO_PERMISSION(2003,"权限不足,请联系管理员");
+    private int code;    private String msg;    ResultCode(int code, String msg) {        this.code = code;        this.msg = msg;    }
+}

+ 31 - 0
huimv-manage/src/main/java/com/huimv/manage/exception/ResultVO.java

@@ -0,0 +1,31 @@
+package com.huimv.manage.exception;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public class ResultVO<T> {
+    /**
+     * 状态码,比如1000代表响应成功
+     */
+    private int code;
+    /**
+     * 响应信息,用来说明响应情况
+     */
+    private String msg;
+    /**
+     * 响应的具体数据
+     */
+    private T data;
+    public ResultVO(T data) {
+        this(ResultCode.SUCCESS, data);
+    }    public ResultVO(ResultCode resultCode, T data) {
+        this.code = resultCode.getCode();
+        this.msg = resultCode.getMsg();
+        this.data = data;
+    }
+}

+ 15 - 0
huimv-manage/src/main/java/com/huimv/manage/service/IApplyService.java

@@ -0,0 +1,15 @@
+package com.huimv.manage.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.huimv.manage.dao.entity.EtApplyEntity;
+import com.huimv.manage.util.Result;
+
+import java.util.List;
+
+public interface IApplyService {
+    // 展示任务列表
+    Result listApply();
+
+    // 保存新任务(号)
+    Result saveNewMission(JSONArray applyJa);
+}

+ 85 - 0
huimv-manage/src/main/java/com/huimv/manage/service/impl/ApplyServiceImpl.java

@@ -0,0 +1,85 @@
+package com.huimv.manage.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.manage.dao.entity.EtApplyEntity;
+import com.huimv.manage.dao.repo.EtApplyRepo;
+import com.huimv.manage.service.IApplyService;
+import com.huimv.manage.util.Const;
+import com.huimv.manage.util.Result;
+import com.huimv.manage.util.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+public class ApplyServiceImpl implements IApplyService {
+
+    @Autowired
+    private EtApplyRepo applyRepo;
+
+    /**
+     * @Method      : listApply
+     * @Description : 所有任务展示列表
+     * @Params      : []
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/10/28       
+     * @Time        : 18:20
+     */
+    @Override
+    public Result listApply() {
+        //
+        return new Result(ResultCode.SUCCESS,applyRepo.listApply());
+    }
+
+    /**
+     * @Method      : saveNewMission
+     * @Description : 保存新任务(号)
+     * @Params      : [applyJa]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/10/28       
+     * @Time        : 18:20
+     */
+    @Override
+    public Result saveNewMission(JSONArray applyJa) {
+        for(int a=0;a<applyJa.size();a++){
+            JSONObject applyJo = applyJa.getJSONObject(a);
+//            System.out.println("applyJo>>"+applyJo);
+            System.out.println("orgName>>"+applyJo.getString("orgName"));
+
+            EtApplyEntity applyEntity = new EtApplyEntity();
+            applyEntity.setMissionProcessor(applyJo.getString("missionProcessor"));
+            applyEntity.setOrgId(applyJo.getString("orgId"));
+            applyEntity.setOrgName(applyJo.getString("orgName"));
+            applyEntity.setOrgAddress(applyJo.getString("orgAddress"));
+            applyEntity.setOrgLinkman(applyJo.getString("orgLinkman"));
+            applyEntity.setPostCode(applyJo.getString("postCode"));
+            applyEntity.setOrgTel(applyJo.getString("orgTel"));
+            applyEntity.setApplyId(applyJo.getIntValue("applyId"));
+            applyEntity.setAssignedDate(applyJo.getString("assignedDate"));
+            applyEntity.setEarmarkAmount(applyJo.getIntValue("earmarkAmount"));
+            applyEntity.setRealEarmarkAmount(applyJo.getIntValue("realEarmarkAmount"));
+            applyEntity.setConsignmentDate(applyJo.getString("consignmentDate"));
+            applyEntity.setApplyRegionName(applyJo.getString("applyRegionName"));
+            applyEntity.setAnimalType(applyJo.getString("animalType"));
+            applyEntity.setAnimalTypeName(applyJo.getString("animalTypeName"));
+//            applyEntity.setSetDownState(0);
+//            applyEntity.setDeliverState(0);
+            applyRepo.saveAndFlush(applyEntity);
+        }
+        return new Result(ResultCode.SUCCESS, Const.SAVE_NEW_MESSION);
+    }
+}

+ 15 - 0
huimv-manage/src/main/java/com/huimv/manage/util/Const.java

@@ -0,0 +1,15 @@
+package com.huimv.manage.util;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public final class Const {
+    //Constants
+
+    public static  final String SAVE_NEW_MESSION = "保存成功";
+}

+ 79 - 0
huimv-manage/src/main/java/com/huimv/manage/util/Result.java

@@ -0,0 +1,79 @@
+package com.huimv.manage.util;
+
+import java.io.Serializable;
+
+public class Result implements Serializable {
+
+    private boolean success;
+    private Integer code;
+    private String message;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    private Object data;
+
+    //不需要返回数据时使用
+    public Result(ResultCode code) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+    }
+
+    public Result(ResultCode code, Object data) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+        this.data = data;
+    }
+
+    public Result(Integer code, String message, boolean success) {
+        this.code = code;
+        this.message = message;
+        this.success = success;
+    }
+
+    /*
+     * 调用ResultCode类封装常用的返回数据
+     */
+    public static Result SUCCESS(){
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    public static Result ERROR(){
+        return new Result(ResultCode.SERVER_ERROR);
+    }
+
+    public static Result FAIL(){
+        return new Result(ResultCode.FAIL);
+    }
+}

+ 41 - 0
huimv-manage/src/main/java/com/huimv/manage/util/ResultCode.java

@@ -0,0 +1,41 @@
+package com.huimv.manage.util;
+
+public enum ResultCode {
+    SUCCESS(true,10000,"操作成功!"),
+    //---系统错误返回码-----
+    FAIL(false,10001,"操作失败"),
+    UNAUTHENTICATED(false,10002,"您还未登录"),
+    UNAUTHORISE(false,10003,"权限不足"),
+    SERVER_ERROR(false,99999,"抱歉,系统繁忙,请稍后重试!"),
+
+    //---用户操作返回码  2xxxx----
+    MOBILEORPASSWORDERROR(false,20001,"用户名或密码错误");
+    //---企业操作返回码  3xxxx----
+    //---权限操作返回码----
+    //---其他操作返回码----
+
+    //操作是否成功
+    boolean success;
+    //操作代码
+    int code;
+    //提示信息
+    String message;
+
+    ResultCode(boolean success, int code, String message){
+        this.success = success;
+        this.code = code;
+        this.message = message;
+    }
+
+    public boolean success() {
+        return success;
+    }
+
+    public int code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+}

+ 38 - 0
huimv-manage/src/main/java/com/huimv/manage/util/result1/DemoErrors.java

@@ -0,0 +1,38 @@
+package com.huimv.manage.util.result1;
+
+import com.huimv.manage.util.result1.ServiceErrors;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public enum DemoErrors implements ServiceErrors {
+    /**
+     * 错误码
+     */
+    SYSTEM_ERROR(10000, "系统错误"),
+    PARAM_ERROR(10001, "参数错误"),
+    ;
+    private Integer code;
+
+    private String message;
+
+    DemoErrors(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

+ 120 - 0
huimv-manage/src/main/java/com/huimv/manage/util/result1/Result1.java

@@ -0,0 +1,120 @@
+package com.huimv.manage.util.result1;
+
+import java.io.Serializable;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public class Result1<T> implements Serializable {
+    private T data;
+
+    private boolean success;
+
+    private Integer code;
+
+    private String message;
+
+    public Result1() {
+    }
+
+    public static <T> Result1<T> wrapSuccessfulResult(T data) {
+        Result1<T> result = new Result1<T>();
+        result.data = data;
+        result.success = true;
+        result.code = 0;
+        return result;
+    }
+
+    public static <T> Result1<T> wrapSuccessfulResult(String message, T data) {
+        Result1<T> result = new Result1<T>();
+        result.data = data;
+        result.success = true;
+        result.code = 0;
+        result.message = message;
+        return result;
+    }
+
+    public static <T> Result1<T> wrapErrorResult(ServiceErrors error) {
+        Result1<T> result = new Result1<T>();
+        result.success = false;
+        result.code = error.getCode();
+        result.message = error.getMessage();
+        return result;
+    }
+
+    public static <T> Result1<T> wrapErrorResult(ServiceErrors error, Object... extendMsg) {
+        Result1<T> result = new Result1<T>();
+        result.success = false;
+        result.code = error.getCode();
+        result.message = String.format(error.getMessage(), extendMsg);
+        return result;
+    }
+
+    public static <T> Result1<T> wrapErrorResult(Integer code, String message) {
+        Result1<T> result = new Result1<T>();
+        result.success = false;
+        result.code = code;
+        result.message = message;
+        return result;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+
+    public Result1<T> setData(T data) {
+        this.data = data;
+        return this;
+    }
+
+    public boolean isSuccess() {
+        return this.success;
+    }
+
+    public Result1<T> setSuccess(boolean success) {
+        this.success = success;
+        return this;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public Result1<T> setCode(Integer code) {
+        this.code = code;
+        return this;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public Result1<T> setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("success=");
+        sb.append(this.success);
+        sb.append(",");
+        sb.append("code=");
+        sb.append(this.code);
+        sb.append(",");
+        sb.append("message=");
+        sb.append(this.message);
+        sb.append(",");
+        sb.append("data=");
+        sb.append(this.data);
+        sb.append("}");
+        return sb.toString();
+    }
+}

+ 25 - 0
huimv-manage/src/main/java/com/huimv/manage/util/result1/ServiceErrors.java

@@ -0,0 +1,25 @@
+package com.huimv.manage.util.result1;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public interface ServiceErrors {
+    /**
+     * 获取错误码
+     *
+     * @return Integer
+     */
+    Integer getCode();
+
+    /**
+     * 获取错误信息
+     *
+     * @return String
+     */
+    String getMessage();
+}

+ 92 - 0
huimv-manage/src/main/java/com/huimv/manage/webservice/Soap.java

@@ -0,0 +1,92 @@
+package com.huimv.manage.webservice;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.commons.httpclient.params.HttpConnectionParams;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.util.Iterator;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+public class Soap {
+    
+    /**
+     * @Method      : callSoap
+     * @Description : 
+     * @Params      : [text, url]
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/10/28       
+     * @Time        : 16:29
+     */
+    public String callSoap(String text,String url) throws UnsupportedEncodingException {
+        String str = new String(text.getBytes(), "UTF-8");
+        System.out.println(str);
+        HttpClient httpClient = new HttpClient();
+        httpClient.getParams().setParameter(HttpConnectionParams.CONNECTION_TIMEOUT, 3000);
+        httpClient.getParams().setParameter(HttpConnectionParams.SO_TIMEOUT, 1000);
+        PostMethod post = new PostMethod(url);
+        post.setRequestHeader("Content-Type", "text/xml;charset=utf-8");
+        RequestEntity re = new InputStreamRequestEntity(new ByteArrayInputStream(str.getBytes()));
+        post.setRequestEntity(re);
+        BufferedReader in = null;
+        try {
+            int status = httpClient.executeMethod(post);
+            System.out.println("返回状态码>>"+status);
+            if (status == 200) {
+                System.out.println("返回数据成功.");
+                InputStream io = post.getResponseBodyAsStream();
+                InputStreamReader is = new InputStreamReader(io, "UTF-8");
+                in = new BufferedReader(is);
+                String inputLine;
+                StringBuilder result = new StringBuilder();
+                while ((inputLine = in.readLine()) != null) {
+                    result.append(inputLine);
+                }
+                String a = result.toString().replace("&lt;", "<").replace("&gt;", ">");
+                System.out.println("返回下面的数据>>");
+                System.out.println(a);
+                return a;
+            } else {
+                System.out.println("调用接口失败");
+                System.out.println(post.getResponseBodyAsString());
+                return null;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                    return null;
+                }
+            }
+            post.releaseConnection();
+            httpClient.getHttpConnectionManager().closeIdleConnections(0);
+        }
+    }
+
+}

+ 200 - 0
huimv-manage/src/main/java/com/huimv/manage/webservice/task/NewProduceMission.java

@@ -0,0 +1,200 @@
+package com.huimv.manage.webservice.task;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.springframework.stereotype.Component;
+
+import java.util.Iterator;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+public class NewProduceMission {
+
+    /**
+     * @Method : getNewMission
+     * @Description :
+     * @Params : [producerId]
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/10/28
+     * @Time : 16:32
+     */
+    public String getNewMissionText(String producerId) {
+        return "<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n" +
+                "  <soap:Body>\n" +
+                "    <GetNewProduceMission xmlns=\"http://tempuri.org/\">\n" +
+                "      <produceKey>161374</produceKey>\n" +
+                "    </GetNewProduceMission>\n" +
+                "  </soap:Body>\n" +
+                "</soap:Envelope>";
+    }
+
+    public String getNewMessionResult(){
+        return "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                "<soap:Envelope\n" +
+                "    xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" +
+                "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                "    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
+                "    <soap:Body>\n" +
+                "        <GetNewProduceMissionResponse\n" +
+                "            xmlns=\"http://tempuri.org/\">\n" +
+                "            <GetNewProduceMissionResult>\n" +
+                "                <xs:schema id=\"NewDataSet\"\n" +
+                "                    xmlns=\"\"\n" +
+                "                    xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                "                    xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">\n" +
+                "                    <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:UseCurrentLocale=\"true\">\n" +
+                "                        <xs:complexType>\n" +
+                "                            <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">\n" +
+                "                                <xs:element name=\"Mission\">\n" +
+                "                                    <xs:complexType>\n" +
+                "                                        <xs:sequence>\n" +
+                "                                            <xs:element name=\"org_id\" type=\"xs:int\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"org_name\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"org_address\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"org_linkman\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"postcode\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"org_tel\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"ApplyID\" type=\"xs:int\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"AssignedDate\" type=\"xs:dateTime\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"EarMarkAmount\" type=\"xs:long\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"RealEarMarkAmount\" type=\"xs:long\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"MissionProcessor\" type=\"xs:int\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"ConsignmentDate\" type=\"xs:dateTime\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"ApplyRegionName\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"AnimalType\" type=\"xs:int\" minOccurs=\"0\" />\n" +
+                "                                            <xs:element name=\"AnimalTypeName\" type=\"xs:string\" minOccurs=\"0\" />\n" +
+                "                                        </xs:sequence>\n" +
+                "                                    </xs:complexType>\n" +
+                "                                </xs:element>\n" +
+                "                            </xs:choice>\n" +
+                "                        </xs:complexType>\n" +
+                "                    </xs:element>\n" +
+                "                </xs:schema>\n" +
+                "                <diffgr:diffgram\n" +
+                "                    xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\"\n" +
+                "                    xmlns:diffgr=\"urn:schemas-microsoft-com:xml-diffgram-v1\">\n" +
+                "                    <NewDataSet\n" +
+                "                        xmlns=\"\">\n" +
+                "                        <Mission diffgr:id=\"Mission1\" msdata:rowOrder=\"0\">\n" +
+                "                            <org_id>1936</org_id>\n" +
+                "                            <org_name>大兴区动物疾病控制中心</org_name>\n" +
+                "                            <org_address>大兴区动物疾病控制中心</org_address>\n" +
+                "                            <org_linkman>大兴区动物疾病控制中心</org_linkman>\n" +
+                "                            <postcode>102600</postcode>\n" +
+                "                            <org_tel>01069207882                                       </org_tel>\n" +
+                "                            <ApplyID>111111</ApplyID>\n" +
+                "                            <AssignedDate>2021-10-19T09:43:52+08:00</AssignedDate>\n" +
+                "                            <EarMarkAmount>140</EarMarkAmount>\n" +
+                "                            <RealEarMarkAmount>140</RealEarMarkAmount>\n" +
+                "                            <MissionProcessor>1936</MissionProcessor>\n" +
+                "                            <ConsignmentDate>2022-01-17T09:53:18.621132+08:00</ConsignmentDate>\n" +
+                "                            <ApplyRegionName>北京市大兴区</ApplyRegionName>\n" +
+                "                            <AnimalType>3</AnimalType>\n" +
+                "                            <AnimalTypeName>羊</AnimalTypeName>\n" +
+                "                        </Mission>\n" +
+                "                        <Mission diffgr:id=\"Mission2\" msdata:rowOrder=\"1\">\n" +
+                "                            <org_id>1936</org_id>\n" +
+                "                            <org_name>大兴区动物疾病控制中心</org_name>\n" +
+                "                            <org_address>大兴区动物疾病控制中心</org_address>\n" +
+                "                            <org_linkman>大兴区动物疾病控制中心</org_linkman>\n" +
+                "                            <postcode>102600</postcode>\n" +
+                "                            <org_tel>01069207882                                       </org_tel>\n" +
+                "                            <ApplyID>216764</ApplyID>\n" +
+                "                            <AssignedDate>2021-10-19T09:43:52+08:00</AssignedDate>\n" +
+                "                            <EarMarkAmount>140</EarMarkAmount>\n" +
+                "                            <RealEarMarkAmount>140</RealEarMarkAmount>\n" +
+                "                            <MissionProcessor>1936</MissionProcessor>\n" +
+                "                            <ConsignmentDate>2022-01-17T09:53:18.621132+08:00</ConsignmentDate>\n" +
+                "                            <ApplyRegionName>北京市大兴区</ApplyRegionName>\n" +
+                "                            <AnimalType>3</AnimalType>\n" +
+                "                            <AnimalTypeName>羊</AnimalTypeName>\n" +
+                "                        </Mission>\n" +
+                "                    </NewDataSet>\n" +
+                "                </diffgr:diffgram>\n" +
+                "            </GetNewProduceMissionResult>\n" +
+                "        </GetNewProduceMissionResponse>\n" +
+                "    </soap:Body>\n" +
+                "</soap:Envelope>\n";
+    }
+
+    /**
+     * @Method : parseApplyXML
+     * @Description :
+     * @Params : [xml]
+     * @Return : com.alibaba.fastjson.JSONArray
+     * @Author : ZhuoNing
+     * @Date : 2021/10/28
+     * @Time : 16:32
+     */
+    public JSONArray parseApplyXML(String xml) {
+        Document doc = null;
+        try {
+            doc = DocumentHelper.parseText(xml); // 将字符串转为XML
+            Element rootElt = doc.getRootElement(); // 获取根节点
+//            System.out.println("根节点:" + rootElt.getName()); // 拿到根节点的名称
+
+            Iterator iter = rootElt.elementIterator("Body"); // 获取根节点下的子节点 Body
+            Element recordEle = (Element) iter.next();
+
+            Iterator iter2 = recordEle.elementIterator("GetNewProduceMissionResponse");
+            Element recordEle2 = (Element) iter2.next();
+
+            Iterator GetNewMissionEarMarkResultIter = recordEle2.elementIterator("GetNewProduceMissionResult");
+            Element GetNewMissionEarMarkResultIterEle = (Element) GetNewMissionEarMarkResultIter.next();
+
+//            Iterator schemaIter = GetNewMissionEarMarkResultIterEle.elementIterator("schema");
+//            Element schemaEle = (Element) schemaIter.next();
+            Iterator diffgramIter = GetNewMissionEarMarkResultIterEle.elementIterator("diffgram");
+            Element diffgramEle = (Element) diffgramIter.next();
+
+            Iterator newDataSetIter = diffgramEle.elementIterator("NewDataSet");
+            Element newDataSetChildEle = (Element) newDataSetIter.next();
+
+            Iterator missionIter = newDataSetChildEle.elementIterator("Mission");
+            System.out.println("missionIter.hasNext()>>" + missionIter.hasNext());
+            // 所有数据
+            JSONArray allDataJa = new JSONArray();
+
+            while (missionIter.hasNext()) {
+                JSONObject earMarkJo = new JSONObject();
+                allDataJa.add(earMarkJo);
+                Element earMarkIterEle = (Element) missionIter.next();
+                earMarkJo.put("applyID", earMarkIterEle.elementTextTrim("ApplyID"));
+                earMarkJo.put("orgId", earMarkIterEle.elementTextTrim("org_id"));
+                earMarkJo.put("orgName", earMarkIterEle.elementTextTrim("org_name"));
+                earMarkJo.put("orgAddress", earMarkIterEle.elementTextTrim("org_address"));
+                earMarkJo.put("orgLinkman", earMarkIterEle.elementTextTrim("org_linkman"));
+                earMarkJo.put("postCode", earMarkIterEle.elementTextTrim("postcode"));
+                earMarkJo.put("orgTel", earMarkIterEle.elementTextTrim("org_tel"));
+                earMarkJo.put("applyId", earMarkIterEle.elementTextTrim("ApplyID"));
+                earMarkJo.put("assignedDate", earMarkIterEle.elementTextTrim("AssignedDate"));
+                earMarkJo.put("earmarkAmount", earMarkIterEle.elementTextTrim("EarMarkAmount"));
+                earMarkJo.put("realEarmarkAmount", earMarkIterEle.elementTextTrim("RealEarMarkAmount"));
+                earMarkJo.put("missionProcessor", earMarkIterEle.elementTextTrim("MissionProcessor"));
+                earMarkJo.put("consignmentDate", earMarkIterEle.elementTextTrim("ConsignmentDate"));
+                earMarkJo.put("applyRegionName", earMarkIterEle.elementTextTrim("ApplyRegionName"));
+                earMarkJo.put("animalType", earMarkIterEle.elementTextTrim("AnimalType"));
+                earMarkJo.put("animalTypeName", earMarkIterEle.elementTextTrim("AnimalTypeName"));
+            }
+            return allDataJa;
+        } catch (DocumentException e) {
+            e.printStackTrace();
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

+ 18 - 1
huimv-manage/src/main/resources/application-dev.yml

@@ -3,4 +3,21 @@ server:
 
 spring:
   application:
-    name: gov_eartag
+    name: gov_eartag
+
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://192.168.1.57:3306/huimv?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    database: mysql
+    hibernate:
+      ddl-auto: update
+      naming:
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    show-sql: true
+
+

+ 15 - 1
huimv-manage/src/main/resources/application.properties

@@ -1 +1,15 @@
-spring.profiles.active=dev
+spring.profiles.active=dev
+
+#Á¬½Ó³Ø
+spring.datasource.type = org.apache.tomcat.jdbc.pool.DataSource
+
+spring.datasource.tomcat.initial-size=15
+spring.datasource.tomcat.max-wait=20000 
+spring.datasource.tomcat.max-active=50 
+spring.datasource.tomcat.max-idle=15 
+spring.datasource.tomcat.min-idle=8 
+spring.datasource.tomcat.default-auto-commit=true 
+spring.datasource.tomcat.test-on-borrow=false 
+
+webservice.url=http://atap.cadc.net.cn:19090/EarMarkManage/WebService2/ProduceMissionService.asmx?wsdl
+webservice.producerId=161374

+ 38 - 0
huimv-manage/src/test/java/com/huimv/manage/controller/ApplyTest.java

@@ -0,0 +1,38 @@
+package com.huimv.manage.controller;
+
+import com.huimv.manage.dao.entity.EtApplyEntity;
+import com.huimv.manage.service.IApplyService;
+import com.huimv.manage.util.Result;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootTest
+public class ApplyTest {
+    @Autowired
+    private IApplyService applyService;
+
+    @Test
+    public void testListApply(){
+        Result result = applyService.listApply();
+        List<EtApplyEntity> applyList = (List<EtApplyEntity>) result.getData();
+
+        System.out.println("Test>>"+applyList.size());
+    }
+
+    @Test
+    public void testGetNewApply(){
+//        Result result = applyService();
+    }
+}