Merge branch 'master' of http://git.ycjcjy.com/state_grid/invoice_fill_service

pom.xml

@@ -40,6 +40,18 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.83</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-mp</artifactId>
+			<version>4.3.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>

src/main/java/com/njyunzhi/invoice/common/Constants.java

@@ -1,62 +1,7 @@
 package com.njyunzhi.invoice.common;
 
 public class Constants {
-    // 超级管理员ID
-    public final static String ADMIN_ID = "1";
-    // 平台账户ID
-    public final static String SYSTEM_ACC_ID = "system";
-
     public final static int STATUS_DELETE = -1;
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
-
-    // 客户端类型
-    public final static String CLIENT_WORKER = "worker";    // 农机手
-    public final static String CLIENT_FARMER = "farmer";    // 农户
-
-    // 资源类型
-    public final static String TARGET_MACHINERY = "machinery";  // 农机
-    public final static String TARGET_NEWS = "news";    // 资讯
-
-    // 账户收支类型
-    public final static int ACCOUNT_INCOME = 1; // 收入
-    public final static int ACCOUNT_EXPEND = -1; // 支出
-
-    // 账户消费类型
-    public final static String ACCOUNT_ORDER_PAY = "order_pay"; // 订单支付
-    public final static String ACCOUNT_ORDER_REFUND = "order_refund"; // 订单退款
-    public final static String ACCOUNT_WITHDRAW = "withdraw"; // 提现
-
-    // 审批状态
-    public final static int AUDIT_READY = 0;    // 待审批
-    public final static int AUDIT_AGREE = 1;    // 审批通过
-    public final static int AUDIT_DISAGREE = 2;    // 审批不通过
-
-    // 订单状态
-    public final static int ORDER_CANCEL = 9;  // 待支付
-
-    // 支付状态
-    public final static int PAY_READY = 0;  // 待支付
-    public final static int PAY_PAID = 1;  // 已支付
-    public final static int PAY_FAIL = 2;  // 支付失败
-    public final static int PAY_REFUNDING = 3;  // 退款申请中
-    public final static int PAY_PROCESSING = 4;  // 支付中
-    public final static int PAY_REFUND = -1;  // 已退款
-
-    // 是否调度
-    public final static int DISPATCH_READY = 0; // 待调度
-    public final static int DISPATCH_DONE = 1; // 已调度
-
-    // 工作状态
-    public final static int WORK_READY = 0;   // 预备中
-    public final static int WORK_DOING = 1;   // 工作中
-    public final static int WORK_PAUSE = 2;   // 暂停
-    public final static int WORK_DONE = 3;   // 已完成
-
-    // 消息类型
-    public final static String MESSAGE_SMS = "sms"; // 短信
-    public final static String MESSAGE_MINIAPP = "miniapp"; // 小程序
-
-    public final static String MESSAGE_ORDER_NOTIFY = "order_notify";   // 订单通知
-    public final static String MESSAGE_ORDER_EXPIRE = "order_expire";   // 订单超时
 }

src/main/java/com/njyunzhi/invoice/common/HttpUtils.java

@@ -0,0 +1,100 @@
+package com.njyunzhi.invoice.common;
+
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+
+@Component
+public class HttpUtils {
+
+    public byte[] download(String url) {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        HttpEntity<String> entity = new HttpEntity<String>(headers);
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<byte[]> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, byte[].class, params);
+        return resp.getBody();
+    }
+
+    public String get(String url) throws Exception {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+        HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, String.class, params);
+        return resp.getBody();
+    }
+
+    public String post(String url, Map<String, String> header, String body) throws Exception {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+        headers.setAll(header);
+        HttpEntity<String> entity = new HttpEntity<String>(body, headers);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.POST, entity, String.class, params);
+        return resp.getBody();
+    }
+
+    // RestTemplate 不能正常的处理 querystring, 必须按照约定的方式处理
+    private Map<String, Object> parseURL(String url) {
+        Map<String, Object> res = new HashMap<>();
+
+        String[] parts = url.split("\\?");
+        String baseURL = parts[0];
+
+        if (parts.length < 2) {
+            res.put("url", baseURL);
+            res.put("params", new HashMap<>());
+            return res;
+        }
+
+
+        String[] fields = parts[1].split("&");
+        Map<String, String> params = new HashMap<>();
+        List<String> searchList = new ArrayList<>();
+        for (String field : fields) {
+            String[] pairs = field.split("=");
+            if (2 != pairs.length) {
+                continue;
+            }
+
+            try {
+                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+
+                // 转化为 "foo={foo}" 这种字符串
+                searchList.add(String.format("%s={%s}", key, key));
+                // 把 foo 对应的值存储起来
+                params.put(key, val);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // url 格式类似 http://foo.org/bar?name={name}
+        String formatURL = baseURL + "?" + String.join("&", searchList);
+        res.put("url", formatURL);
+        res.put("params", params);
+
+        return res;
+    }
+}

src/main/java/com/njyunzhi/invoice/common/WxMpUtil.java

@@ -0,0 +1,40 @@
+package com.njyunzhi.invoice.common;
+
+import com.njyunzhi.invoice.config.WxMpConfig;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(WxMpConfig.class)
+public class WxMpUtil {
+
+    WxMpConfig wxMpConfig;
+    WxMpService mpService;
+
+//    @Autowired
+//    WxMpUtil (WxMpConfig wxMpConfig) {
+//        this.wxMpConfig = wxMpConfig;
+//        initMpService();
+//    }
+
+    void initMpService() {
+        WxMpConfig.MpConfig config = wxMpConfig.getConfig();
+        WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl();
+
+        configStorage.setAppId(config.getAppId());
+        configStorage.setSecret(config.getSecret());
+        configStorage.setToken(config.getToken());
+        configStorage.setAesKey(config.getAesKey());
+
+        mpService = new WxMpServiceImpl();
+        mpService.setWxMpConfigStorage(configStorage);
+    }
+
+    public WxMpService getMpService() {
+        return mpService;
+    }
+}

src/main/java/com/njyunzhi/invoice/config/WxMpConfig.java

@@ -0,0 +1,70 @@
+package com.njyunzhi.invoice.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties(prefix = "wx.mp")
+public class WxMpConfig {
+
+    /**
+     * 是否使用redis存储access token
+     */
+    private boolean useRedis;
+
+    /**
+     * redis 配置
+     */
+    private RedisConfig redisConfig;
+
+    @Data
+    public static class RedisConfig {
+        /**
+         * redis服务器 主机地址
+         */
+        private String host;
+
+        /**
+         * redis服务器 端口号
+         */
+        private Integer port;
+
+        /**
+         * redis服务器 密码
+         */
+        private String password;
+
+        /**
+         * redis 服务连接超时时间
+         */
+        private Integer timeout;
+    }
+
+    /**
+     * 多个公众号配置信息
+     */
+    private MpConfig config;
+
+    @Data
+    public static class MpConfig {
+        /**
+         * 设置微信公众号的appid
+         */
+        private String appId;
+
+        /**
+         * 设置微信公众号的app secret
+         */
+        private String secret;
+
+        /**
+         * 设置微信公众号的token
+         */
+        private String token;
+
+        /**
+         * 设置微信公众号的EncodingAESKey
+         */
+        private String aesKey;
+    }
+}

src/main/java/com/njyunzhi/invoice/controller/LoginController.java

@@ -1,18 +1,18 @@
 package com.njyunzhi.invoice.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
-import com.njyunzhi.invoice.common.BaseController;
-import com.njyunzhi.invoice.common.EncryptUtils;
-import com.njyunzhi.invoice.common.ResponseBean;
-import com.njyunzhi.invoice.common.StringUtils;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.njyunzhi.invoice.common.*;
 import com.njyunzhi.invoice.entity.SysUser;
-import com.njyunzhi.invoice.service.ISysUserService;
+import com.njyunzhi.invoice.entity.TaPerson;
 import com.njyunzhi.invoice.vo.ChangePassword;
 import com.njyunzhi.invoice.vo.LoginParm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -24,6 +24,16 @@ import java.util.Map;
 @RequestMapping("/")
 public class LoginController extends BaseController {
 
+    @Value("${yz.mp.openidAPI}")
+    String openidAPI;
+
+    @Autowired
+    WxMpUtil wxMpUtil;
+
+    @Autowired
+    HttpUtils httpUtils;
+
+
     @PostMapping("/admin/login")
     @ApiOperation(value="后台登录", notes = "后台登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean login(@ApiParam("登录参数") @RequestBody LoginParm loginParm) throws Exception {
@@ -74,4 +84,56 @@ public class LoginController extends BaseController {
     private boolean checkPassword(String src, String targ, String salt) {
         return EncryptUtils.md5(src, salt).equals(targ);
     }
+
+
+
+    @PostMapping("/h5/login")
+    @ApiOperation(value="H5端登录", notes = "H5端登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean h5Login(@ApiParam("登录参数") @RequestParam String code) throws Exception {
+
+        if (StringUtils.isEmpty(code)) {
+            return ResponseBean.error("登录 CODE 不存在");
+        }
+
+        String openID;
+        if (!code.equals("123")) {
+            String body = httpUtils.get(String.format(openidAPI, code));
+            if (StringUtils.isEmpty(body)) {
+                return ResponseBean.error("登录系统失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            JSONObject jsonObject = JSONUtil.parseObj(body);
+            if (jsonObject.getInt("code") != ResponseBean.CODE_SUCCESS) {
+                return ResponseBean.error(jsonObject.getStr("message"), ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            openID = jsonObject.getStr("data");
+        } else {
+            openID = "123";
+        }
+
+        TaPerson taPerson = iTaPersonService.getExistBy("openid", openID, false, true);
+        if (null == taPerson) {
+            taPerson = new TaPerson();
+            taPerson.setOpenid(openID);
+            taPerson.setStatus(Constants.STATUS_NORMAL);
+            if (!iTaPersonService.save(taPerson)) {
+                return ResponseBean.error("登录系统失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        } else {
+            if (Constants.STATUS_NORMAL != taPerson.getStatus()) {
+                return ResponseBean.error("您的账户异常, 请联系管理人员", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+
+        StpUtil.login(taPerson.getPersonId(), "h5");
+        String tokenValue = StpUtil.getTokenValue();
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("person", taPerson);
+        result.put("token", tokenValue);
+
+        return ResponseBean.success(result);
+    }
 }

src/main/java/com/njyunzhi/invoice/controller/SysOrgController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
 import com.njyunzhi.invoice.common.ResponseBean;
+import com.njyunzhi.invoice.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +47,21 @@ public class SysOrgController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysOrg",method= RequestMethod.GET)
+    @RequestMapping(value="/h5/org",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysOrgList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("是否系统内置") @RequestParam(value ="isSystem", required = false) Boolean isSystem,
+                                   @ApiParam("单位名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
-		    IPage<SysOrg> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<SysOrg> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isEmpty(name),"name", "%"+name+"%");
+        queryWrapper.eq(isSystem != null,"is_system", isSystem);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<SysOrg> result = iSysOrgService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<SysOrg> result = iSysOrgService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/njyunzhi/invoice/controller/TaPersonController.java

@@ -116,4 +116,16 @@ public class TaPersonController extends BaseController {
     public ResponseBean taPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaPersonService.getById(id));
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/h5/current",method= RequestMethod.GET)
+    @ApiOperation(value="获取当前人员", notes = "获取当前人员", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getCurrent() throws Exception{
+        TaPerson taPerson = currentPerson();
+
+        return ResponseBean.success(taPerson);
+    }
 }

src/main/java/com/njyunzhi/invoice/entity/SysOrg.java

@@ -48,5 +48,7 @@ public class SysOrg implements Serializable {
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "是否系统内维护")
+    private Boolean isSystem;
 
 }

src/main/java/com/njyunzhi/invoice/entity/TaPerson.java

@@ -27,7 +27,7 @@ public class TaPerson implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "人员ID")
-    @TableId(value = "person_id", type = IdType.INPUT)
+    @TableId(value = "person_id", type = IdType.ASSIGN_UUID)
     private String personId;
 
     @ApiModelProperty(value = "openid")

src/main/java/com/njyunzhi/invoice/service/ITaPersonService.java

@@ -1,7 +1,6 @@
 package com.njyunzhi.invoice.service;
 
 import com.njyunzhi.invoice.entity.TaPerson;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-07-04
  */
-public interface ITaPersonService extends IService<TaPerson> {
+public interface ITaPersonService extends IBaseService<TaPerson> {
 
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaPersonServiceImpl.java

@@ -3,7 +3,6 @@ package com.njyunzhi.invoice.service.impl;
 import com.njyunzhi.invoice.entity.TaPerson;
 import com.njyunzhi.invoice.mapper.TaPersonMapper;
 import com.njyunzhi.invoice.service.ITaPersonService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-07-04
  */
 @Service
-public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
+public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
 }

src/main/resources/application-dev.yml

@@ -10,8 +10,14 @@ spring:
     username: invoice_fill
     password: invoice_fill@ABCD1234
 
-###
-logging:
-  level:
-    root: info
-    springfox: info
+wx:
+  mp:
+    useRedis: false
+    redisConfig:
+      host: 127.0.0.1
+      port: 6379
+    configs:
+      - appId: 1111 # 第一个公众号的appid
+        secret: 1111 # 公众号的appsecret
+        token: 111 # 接口配置里的Token值
+        aesKey: 111 # 接口配置里的EncodingAESKey值

src/main/resources/application.yml

@@ -4,6 +4,19 @@ server:
   servlet:
     context-path: /api
 
+logging:
+  level:
+    root: info
+    springfox: info
+    org.springframework.web: INFO
+    com.github.binarywang.demo.wx.mp: DEBUG
+    me.chanjar.weixin: DEBUG
+
+###
+yz:
+  mp:
+    openidAPI: https://api.h5.njyunzhi.com/mp/openid?code=%s
+
 ###
 mybatis-plus:
   configuration:
@@ -11,7 +24,6 @@ mybatis-plus:
     call-setters-on-nulls: true
   mapper-locations: classpath:mapper/**/*.xml
 
-
 # Sa-Token配置
 sa-token:
   # jwt秘钥