feaets

README.md

@@ -0,0 +1,6 @@
+### 说明
+
+本项目把所有依赖放到了 libs 目录
+配置文件放到了 config 目录
+
+启动命令 java -Dloader.path=./libs -jar gnyy.xxx.jar

deploy/bootstrap.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+#
+source /etc/profile
+
+PROC_STR="gnyy-v"
+SERVICE_HOME="/home/xlk/marketing-cloud/service"
+LOG="$SERVICE_HOME/logs/service.log"
+JAR=$(ls -lt ${SERVICE_HOME}/*.jar|head -n1|rev|cut -d" " -f1|rev)
+LIBS="$SERVICE_HOME/libs"
+
+start() {
+    PID=`ps -ef|grep $PROC_STR|grep -v grep|awk '{print $2}'`
+    if [[ "$PID" != "" ]]; then
+        echo ""
+        echo "Service is running. pid=$PID"
+        echo ""
+        exit 0
+    else
+        echo ""
+        echo "Start service ..."
+        echo "FILE: $JAR"
+
+        nohup java -Dloader.path=$LIBS -jar $JAR > $LOG 2>&1 &
+
+        echo "Start finished"
+        echo "Pls goto $LOG see process status"
+        echo ""
+    fi
+}
+
+stop() {
+    echo ""
+    echo "Stoping service ..."
+
+    PID=`ps -ef|grep $PROC_STR|grep -v grep|awk '{print $2}'`
+    if [[ "$PID" != "" ]]; then
+        kill -9 $PID
+    fi
+
+    # 这个延迟不能去掉
+    sleep 2s
+    echo "Service is stoped"
+    echo ""
+}
+
+case $1 in
+    "start")
+        start ;;
+    "stop")
+        stop ;;
+    "reload"|"restart")
+        stop
+        start ;;
+    *)
+        echo "Usage: `basename $0` {start|stop|restart}"
+        exit 1
+esac

deploy/gnyy.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=marketing
+After=mysqld.target
+
+[Service]
+Type=forking
+ExecStart=/home/xlk/marketing-cloud/service/service.sh start
+ExecReload=/home/xlk/marketing-cloud/service/service.sh restart
+ExecStop=/home/xlk/marketing-cloud/service/service.sh stop
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

pom.xml

@@ -177,9 +177,46 @@
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
 							<includeSystemScope>true</includeSystemScope>
+
+							<!-- 以下为减少依赖 -->
+							<layout>ZIP</layout>
+							<includes>
+<!--								<include>-->
+<!--									<groupId>nothing</groupId>-->
+<!--									<artifactId>nothing</artifactId>-->
+<!--								</include>-->
+								<include>
+									<groupId>com.yunzhi</groupId>
+									<artifactId>gnyy</artifactId>
+								</include>
+							</includes>
 						</configuration>
 					</plugin>
 
+					<!-- 拷贝依赖 -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<excludeGroupIds>
+										com.yunzhi
+									</excludeGroupIds>
+									<excludeArtifactIds>
+										gnyy
+									</excludeArtifactIds>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
 					<!-- 跳过测试 -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>

src/main/java/com/yunzhi/gnyy/common/BaseController.java

@@ -12,10 +12,10 @@ import org.springframework.stereotype.Component;
 public class BaseController {
 
     @Autowired
-    IWxUserService iWxUserService;
+    protected IWxUserService iWxUserService;
 
     @Autowired
-    ITaPersonService iTaPersonService;
+    protected ITaPersonService iTaPersonService;
 
     public String getLoginId() {
         return StpUtil.getLoginIdAsString();

src/main/java/com/yunzhi/gnyy/common/HttpUtils.java

@@ -1,5 +1,6 @@
 package com.yunzhi.gnyy.common;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -8,9 +9,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
 
+@Slf4j
 @Component
 public class HttpUtils {
     public String get(String url) throws Exception {
+        log.info("请求地址: ", url);
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
@@ -21,7 +24,9 @@ public class HttpUtils {
         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();
+        String res = resp.getBody();
+        log.info("请求结果: ", res);
+        return res;
     }
 
     public String post(String url, Map<String, String> header, String body) throws Exception {

src/main/java/com/yunzhi/gnyy/config/SaTokenConfigure.java

@@ -18,13 +18,11 @@ public class SaTokenConfigure implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
 
         List<String> anonList = new ArrayList<>();
-        anonList.add("/wxpay/notify/**");
-        anonList.add("/**/sms-captcha");
-        anonList.add("/**/**/sms-captcha");
-        anonList.add("/**/preload");
+        anonList.add("/swagger-ui/**");
+        anonList.add("/swagger-resources/**");
+        anonList.add("/v2/**");
+        anonList.add("/wx/preload");
         anonList.add("/**/login");
-        anonList.add("/**/**/login");
-        anonList.add("/**/**/login");
 
         // 注册Sa-Token的路由拦截器
         registry.addInterceptor(new SaRouteInterceptor())

src/main/java/com/yunzhi/gnyy/controller/TaPersonController.java

@@ -1,11 +1,9 @@
 package com.yunzhi.gnyy.controller;
 
-import com.yunzhi.gnyy.common.BaseController;
-import com.yunzhi.gnyy.common.Constants;
-import com.yunzhi.gnyy.common.ResponseBean;
-import com.yunzhi.gnyy.common.StringUtils;
+import com.yunzhi.gnyy.common.*;
 import com.yunzhi.gnyy.entity.SysSetting;
 import com.yunzhi.gnyy.entity.TaPerson;
+import com.yunzhi.gnyy.entity.WxUser;
 import com.yunzhi.gnyy.service.ISysSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,11 +11,10 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.gnyy.service.ITaPersonService;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -36,7 +33,7 @@ public class TaPersonController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(TaPersonController.class);
 
     @Autowired
-    public ITaPersonService iTaPersonService;
+    public HttpUtils httpUtils;
 
     @Autowired
     public ISysSettingService iSysSettingService;
@@ -91,23 +88,31 @@ public class TaPersonController extends BaseController {
 //        }
 //    }
 //
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taPerson 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
-//
-//        if (iTaPersonService.updateById(taPerson)){
-//            return ResponseBean.success(iTaPersonService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/{clientId}/person",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taPersonUpdate(@ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
+
+        // TODO 暂未校验 taPerson 各个必填字段
+
+        WxUser wxUser = currentWxUser();
+        if (StringUtils.isEmpty(wxUser.getPersonId())) {
+            taPerson.setPersonId(null);
+            iTaPersonService.save(taPerson);
+            wxUser.setPersonId(taPerson.getPersonId());
+            iWxUserService.updateById(wxUser);
+        } else {
+            taPerson.setPersonId(wxUser.getPersonId());
+            iTaPersonService.updateById(taPerson);
+        }
+
+        return ResponseBean.success(taPerson);
+    }
 //
 //    /**
 //     * 根据id查询对象
@@ -131,9 +136,14 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("人员不存在");
         }
 
+        String today = DateUtils.toString(LocalDateTime.now(), "yyyy-MM-dd");
+
         SysSetting sysSetting = iSysSettingService.getById(Constants.SETTING_BARCODE_URL);
-        String url = sysSetting.getContent() + "?id_no=" + StringUtils.urlEncode(taPerson.getIdNo());
+        String url = String.format("%s?createDate=%s&idNo=%s",
+                sysSetting.getContent(),
+                StringUtils.urlEncode(today),
+                StringUtils.urlEncode(taPerson.getIdNo()));
 
-        return ResponseBean.success(iTaPersonService.getById(id));
+        return ResponseBean.success(httpUtils.get(url));
     }
 }

src/main/java/com/yunzhi/gnyy/controller/WxMaController.java

@@ -6,8 +6,10 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import cn.dev33.satoken.stp.StpUtil;
 import com.yunzhi.gnyy.common.*;
+import com.yunzhi.gnyy.entity.BdsOrganization;
 import com.yunzhi.gnyy.entity.TaPerson;
 import com.yunzhi.gnyy.entity.WxUser;
+import com.yunzhi.gnyy.service.IBdsOrganizationService;
 import com.yunzhi.gnyy.service.ITaPersonService;
 import com.yunzhi.gnyy.service.IWxUserService;
 import com.yunzhi.gnyy.vo.LoginParam;
@@ -28,13 +30,10 @@ import java.util.Map;
 public class WxMaController extends BaseController {
 
     @Autowired
-    ITaPersonService iTaPersonService;
-
-    @Autowired
-    IWxUserService iWxUserService;
+    WxUtils wxUtils;
 
     @Autowired
-    WxUtils wxUtils;
+    IBdsOrganizationService iBdsOrganizationService;
 
     private boolean checkLoginParam(LoginParam loginParam) {
         return !StringUtils.isEmpty(loginParam.getCode())
@@ -83,6 +82,10 @@ public class WxMaController extends BaseController {
         TaPerson taPerson = null;
         if (!StringUtils.isEmpty(wxUser.getPersonId())) {
             taPerson = iTaPersonService.getExistBy("person_id", wxUser.getPersonId(), false, true);
+            if (null != taPerson && !StringUtils.isEmpty(taPerson.getDeptCode())) {
+                BdsOrganization org = iBdsOrganizationService.getById(taPerson.getDeptCode());
+                taPerson.setDeptName(org.getName());
+            }
         }
 
         StpUtil.login(wxUser.getUserId(), "wx");

src/main/java/com/yunzhi/gnyy/entity/TaPerson.java

@@ -2,6 +2,8 @@ package com.yunzhi.gnyy.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -39,8 +41,8 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "身份证号码")
     private String idNo;
 
-    @ApiModelProperty(value = "科室名称")
-    private String deptName;
+    @ApiModelProperty(value = "科室编码")
+    private String deptCode;
 
     @ApiModelProperty(value = "状态")
     private Integer status;
@@ -48,5 +50,8 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "科室名称")
+    private String deptName;
 
 }

src/main/resources/application-prod.yml

@@ -1,3 +1,6 @@
+server:
+  port: 8081
+
 ###
 spring:
   servlet:
@@ -5,7 +8,7 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://110.40.183.156:3306/lyg_gnyy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/lyg_gnyy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: lyg_gnyy
     password: gnyy@ABCD1234
 

src/main/resources/application.yml

@@ -33,8 +33,8 @@ mybatis-plus:
 ###
 weixin:
   miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
+    appid: wx835627a9b9b3932a
+    secret: 51cc2b26c1628ae098f05a3ba8e6f6f4
     token:
     aesKey:
     msgDataFormat: JSON