修改

kongdeqiang

2023-07-04 4058cdff1546659f29e66414a50d49412df67f41

修改

 pom.xml

@@ -111,21 +111,21 @@
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>
        <dependency>
            <groupId>net.sf</groupId>
            <artifactId>jni4net</artifactId>
            <version>0.8.8.0</version>
            <scope>system</scope>
            <systemPath>${basedir}/src/main/resources/jni/jni4net.j-0.8.8.0.jar</systemPath>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>net.sf</groupId>-->
<!--            <artifactId>jni4net</artifactId>-->
<!--            <version>0.8.8.0</version>-->
<!--            <scope>system</scope>-->
<!--            <systemPath>${basedir}/src/main/resources/jni/jni4net.j-0.8.8.0.jar</systemPath>-->
<!--        </dependency>-->

        <dependency>
            <groupId>com.led</groupId>
            <artifactId>show</artifactId>
            <version>0.0.1</version>
            <scope>system</scope>
            <systemPath>${basedir}/src/main/resources/jni/LedShow.j4n.jar</systemPath>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.led</groupId>-->
<!--            <artifactId>show</artifactId>-->
<!--            <version>0.0.1</version>-->
<!--            <scope>system</scope>-->
<!--            <systemPath>${basedir}/src/main/resources/jni/LedShow.j4n.jar</systemPath>-->
<!--        </dependency>-->
    </dependencies>

    <build>

 src/main/java/com/boying/common/SystemConfigProperties.java

@@ -66,7 +66,13 @@
    @Value("${ffzf.ip}")
    private String ffzfIp;

    @Value("${ffzf.loginIp}")
    private String loginIp;

    @Value("${ffzf.info}")
    private String info;

    @Value("${ffzf.getNumber}")
    private String getNumber;

}

 src/main/java/com/boying/controller/StreetController.java

@@ -113,14 +113,15 @@
    public Object findAll() {
        Map<String,Object> map = new HashMap<>();
        QueryWrapper<Street> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Street::getType,0);
        map.put("list1",streetService.list(wrapper));
        wrapper.clear();
        wrapper.lambda()
                .eq(Street::getType,1);
        map.put("list2",streetService.list(wrapper));
        return R.ok(map);
//        wrapper.lambda()
//                .eq(Street::getType,0);
//        map.put("list1",streetService.list(wrapper));
//        wrapper.clear();
//        wrapper.lambda()
//                .eq(Street::getType,1);
//        map.put("list2",streetService.list(wrapper));

        return R.ok(streetService.list());
    }

    @PostMapping("findLogo")

 src/main/java/com/boying/controller/phone/TicketController.java

@@ -28,6 +28,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@RestController
@@ -186,7 +189,23 @@
            String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
            ticket.setMoneyStr(s.toString());
        }
        return R.ok(ticketService.updateById(ticket));
        if(StringUtils.isBlank(ticket.getNumber())){
            ticket = ticketService.getNumber(ticket);
            ticket.setPush(0);
            ticketService.uploadInfo(ticket);
        }
        return R.ok();
    }

    //与执法对接
    @GetMapping("/getResult")
    public Object getResult(Ticket ticket){
        if(StringUtils.isNotBlank(ticket.getShouQianMing())){
            ticketService.updateById(ticket);
            return R.ok();
        }else {
            return R.failed("更新失败");
        }
    }

    public void saveLogo(String name,String lng,String lat){
@@ -350,8 +369,11 @@
     */
    @ApiOperation(value = "测试对接", notes = "测试对接")
    @GetMapping("/test" )
    public void test() {
    public R test() {
        Ticket byId = ticketService.getById(13);
        byId = ticketService.getNumber(byId);
        byId.setPush(0);
        ticketService.uploadInfo(byId);
        return R.ok();
    }
}

 src/main/java/com/boying/entity/Ticket.java

@@ -131,8 +131,12 @@

    //执法人1姓名
    private String zfName1;
    //执法人1签名
    private String zfQianMing1;
    //执法人2姓名
    private String zfName2;
    //执法人2签名
    private String zfQianMing2;

    //执法人员1证号
    private String zfNum1;
@@ -142,10 +146,20 @@
    //最后执行日期
    private String days;

    //执法局印章
    private String zhifaYinZhang;

    //生成日期
    private String wordDate;

    //收件人签名
    private String shouQianMing;

    /**
     * 流水号
     */
    private String code2;
    private Integer push;

    @Transient
    @TableField(exist = false)

 src/main/java/com/boying/service/TicketService.java

@@ -31,4 +31,6 @@
    double sumByPrice3();

    void uploadInfo(Ticket ticket);

    Ticket getNumber(Ticket byId);
}

 src/main/java/com/boying/service/impl/TicketServiceImpl.java

@@ -1,7 +1,9 @@
package com.boying.service.impl;

import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,10 +17,13 @@
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
import lombok.AllArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -147,14 +152,69 @@

    @Override
    public void uploadInfo(Ticket ticket) {
        DateFormat sdf= new SimpleDateFormat("yyyy年MM月dd日");
        String ffzfIp = systemConfigProperties.getFfzfIp();
        String info = systemConfigProperties.getInfo();
        Map<String, Object> map = new HashMap<>();;
        Map<String, Object> map = new HashMap<>();
        String jsonString = JSONUtil.toJsonStr(ticket);
        Gson gson = new Gson();
        map = gson.fromJson(jsonString, map.getClass());
        System.out.println(jsonString);
        RestTemplate restTemplate = new RestTemplate();
        ResponseEntity<R> entity = restTemplate.postForEntity(ffzfIp+info, HTTPEntityUtil.setEntity(map), R.class);
        int code = entity.getBody().getCode();
        if(code == 0){
            ticket.setPush(1);
            try {
                Date date = new Date();
                String format = sdf.format(date);
                ticket.setWordDate(format);
            }catch (Exception e){
                e.printStackTrace();
    }
            this.updateById(ticket);
        }
    }

    @Override
    public Ticket getNumber(Ticket byId) {
        String ffzfIp = systemConfigProperties.getFfzfIp();
        String getNumber = systemConfigProperties.getGetNumber();
        String loginIp = systemConfigProperties.getLoginIp();
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("username","test");
        paramMap.put("password","ttt000");
        paramMap.put("randomStr","blockPuzzle");
        paramMap.put("grant_type","password");
        String body = HttpRequest.post(loginIp)
                .header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded")
                .header("TENANT-ID", "1")
                .header("isToken", "false")
                .header(Header.AUTHORIZATION, "Basic YXBwOmFwcA==")
                .form(paramMap)
                .timeout(15000)
                .execute()
                .body();
        System.out.println(body);
        JSONObject map = JSON.parseObject(body);
        String access_token = (String)map.get("access_token");

        String body1 = HttpRequest.get(ffzfIp+getNumber)
                .header(Header.CONTENT_TYPE, "application/json")
                .header("TENANT-ID", "1")
                .header(Header.AUTHORIZATION, "bearer "+access_token)
                .timeout(15000)
                .execute()
                .body();
        System.out.println(body1);
        JSONObject map1 = JSON.parseObject(body1);
        String data = (String)map1.get("data");
        String[] split = data.split("-");
        byId.setYear(split[0]);
        byId.setNumber(split[1]);
        updateById(byId);
        return byId;
    }


}

 src/main/java/com/boying/util/HTTPEntityUtil.java

@@ -38,6 +38,28 @@
        return httpEntity;
    }

    //map类型使用
    public static HttpEntity setEntity2(Map<String, Object> map) {
        HttpHeaders headers = new HttpHeaders();
       // headers.setContentType(MediaType.parseMediaType("application/json; charset=UTF-8"));
        headers.add("Tenant-Id","1");
        headers.add("isToken","false");
        headers.add("Authorization","Basic YXBwOmFwcA==");
        ReturnData returnData = new ReturnData();
        try {
            if (map != null) {
                HttpEntity<Map<String, Object>> httpEntity = new
                        HttpEntity<>(map, headers);
                return httpEntity;
            }
        } catch (Exception e) {
            returnData.setCode(-1);
            returnData.setMsg("系统内部出错!FASP-HESSIAN-1001: 请求 网关出现异常!");
        }
        HttpEntity<String> httpEntity = new HttpEntity<>(headers);
        return httpEntity;
    }

    //list类型使用
    public static HttpEntity setEntityForList(List<Map<String, Object>> list){
        HttpHeaders headers = new HttpHeaders();