Merge remote-tracking branch 'origin/master'

# Conflicts:
#	boman-wechat/src/main/java/com/boman/wechat/controller/AppletLoginController.java

boman-api/boman-domain/src/main/java/com.boman.domain/SysDept.java

@@ -50,7 +50,13 @@ public class SysDept extends BaseEntity
 
     /** 父部门名称 */
     private String parentName;
-    
+
+    private boolean listByParentId;
+
+    private boolean hasChildren = Boolean.TRUE;
+
+    private Integer num;
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
@@ -178,6 +184,30 @@ public class SysDept extends BaseEntity
         this.children = children;
     }
 
+    public boolean isListByParentId() {
+        return listByParentId;
+    }
+
+    public void setListByParentId(boolean listByParentId) {
+        this.listByParentId = listByParentId;
+    }
+
+    public boolean isHasChildren() {
+        return hasChildren;
+    }
+
+    public void setHasChildren(boolean hasChildren) {
+        this.hasChildren = hasChildren;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

boman-api/boman-domain/src/main/java/com.boman.domain/dto/WxMsgDto.java

@@ -0,0 +1,73 @@
+package com.boman.domain.dto;
+
+import com.boman.domain.TemplateData;
+
+import java.util.List;
+import java.util.Map;
+
+public class WxMsgDto {
+
+    private String touser;//用户openid
+    private String template_id;//模版id
+    private String page = "pages/indexView/addressee/index";//默认跳到小程序首页
+    private String emphasis_keyword = "title.DATA";//放大那个推送字段
+    private Map<String, TemplateData> data;//推送文字
+    private List<Long> ids;
+    private Map<String, Object> params;
+
+    public String getTouser() {
+        return touser;
+    }
+
+    public void setTouser(String touser) {
+        this.touser = touser;
+    }
+
+    public String getTemplate_id() {
+        return template_id;
+    }
+
+    public void setTemplate_id(String template_id) {
+        this.template_id = template_id;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public void setPage(String page) {
+        this.page = page;
+    }
+
+    public String getEmphasis_keyword() {
+        return emphasis_keyword;
+    }
+
+    public void setEmphasis_keyword(String emphasis_keyword) {
+        this.emphasis_keyword = emphasis_keyword;
+    }
+
+    public Map<String, TemplateData> getData() {
+        return data;
+    }
+
+    public void setData(Map<String, TemplateData> data) {
+        this.data = data;
+    }
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<Long> ids) {
+        this.ids = ids;
+    }
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+}

boman-api/boman-domain/src/main/java/com/boman/domain/TemplateData.java

@@ -0,0 +1,13 @@
+package com.boman.domain;
+
+public class TemplateData {
+    private Object value;
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+}

boman-modules/boman-file/src/main/java/com/boman/file/controller/SysFileController.java

@@ -1,7 +1,9 @@
 package com.boman.file.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.Base64Dto;
+import com.boman.file.utils.HttpClientUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,14 +17,17 @@ import com.boman.common.core.utils.file.FileUtils;
 import com.boman.file.service.ISysFileService;
 import com.boman.domain.SysFile;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 文件请求处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
-public class SysFileController
-{
+public class SysFileController {
     private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
 
     @Autowired
@@ -32,19 +37,15 @@ public class SysFileController
      * 文件上传请求
      */
     @PostMapping("upload")
-    public R<SysFile> upload(MultipartFile file)
-    {
-        try
-        {
+    public R<SysFile> upload(MultipartFile file) {
+        try {
             // 上传并返回访问地址
             String url = sysFileService.uploadFile(file);
             SysFile sysFile = new SysFile();
             sysFile.setName(FileUtils.getName(url));
             sysFile.setUrl(url);
             return R.ok(sysFile);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("上传文件失败", e);
             return R.fail(e.getMessage());
         }
@@ -68,8 +69,46 @@ public class SysFileController
     }
 
     @GetMapping("/getConfigPath")
-    public String getConfigPath(){
+    public String getConfigPath() {
         return sysFileService.getConfigPath();
     }
 
+
+    /**
+     * ocr身份证识别,微信接口
+     *
+     * @return
+     */
+    @PostMapping("/ocrIdCard")
+    public AjaxResult ocrIdCard(MultipartFile file) {
+
+        String accessTokenResult = getAccessToken();
+        JSONObject jsonObject = JSONObject.parseObject(accessTokenResult);
+        String accessToken = jsonObject.getString("access_token");
+        //https://api.weixin.qq.com/cv/ocr/idcard?type=MODE&img_url=ENCODE_URL&access_token=ACCESS_TOCKEN
+        String result = "";
+        try {
+            String url = sysFileService.uploadFile(file);
+            result = HttpClientUtils.doPost("https://api.weixin.qq.com/cv/ocr/idcard?type=photo&img_url=" + url + "&access_token=" + accessToken, null);
+            JSONObject parse = JSONObject.parseObject(result);
+            String errcode = parse.getString("errcode");
+            System.out.println("解析身份证返回值:"+result);
+            if ("0".equals(errcode)){
+                return AjaxResult.success(parse);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.error("识别失败");
+    }
+
+    private static String getAccessToken() {
+        String accessToken = "";
+        try {
+            accessToken = HttpClientUtils.doGet1("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxb9b83f3c86545690&secret=95adc6921a24a3c6cff55f2a1290f6f6");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return accessToken;
+    }
 }

boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java

@@ -18,6 +18,7 @@ import com.boman.file.utils.FileUploadUtils;
 import com.boman.web.core.api.RemoteAttendanceService;
 import com.boman.web.core.api.RemoteObjService;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,7 +26,6 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;

boman-modules/boman-file/src/main/java/com/boman/file/utils/HttpClientUtils.java

@@ -0,0 +1,112 @@
+package com.boman.file.utils;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class HttpClientUtils {
+
+    final static int TIMEOUT = 1000;
+    final static int TIMEOUT_MSEC = 5 * 1000;
+
+    public static String doPost(String url, Map<String, String> paramMap) throws IOException {
+        // 创建Httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = null;
+        String resultString = "";
+        try {
+            // 创建Http Post请求
+            HttpPost httpPost = new HttpPost(url);
+            // 创建参数列表
+            if (paramMap != null) {
+                List<NameValuePair> paramList = new ArrayList<>();
+                for (Map.Entry<String, String> param : paramMap.entrySet()) {
+                    paramList.add(new BasicNameValuePair(param.getKey(), param.getValue()));
+                }
+                // 模拟表单
+                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
+                httpPost.setEntity(entity);
+            }
+
+            httpPost.setConfig(builderRequestConfig());
+
+            // 执行http请求
+            response = httpClient.execute(httpPost);
+
+            resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                throw e;
+            }
+        }
+
+        return resultString;
+    }
+
+    public static String doGet(String url, Map<String, String> paramMap) throws IOException {
+        url += "?appid=" + paramMap.get("appid") + "&secret=" + paramMap.get("secret") + "&js_code=" + paramMap.get("js_code") + "&grant_type=" + paramMap.get("grant_type");
+        // 创建Httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = null;
+        String resultString = "";
+        try {
+            // 创建Http Post请求
+            HttpGet httpGet = new HttpGet(url);
+            // 执行http请求
+            response = httpClient.execute(httpGet);
+            resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                throw e;
+            }
+        }
+        return resultString;
+    }
+
+    public static String doGet1(String url) throws IOException {
+        // 创建Httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = null;
+        String resultString = "";
+        try {
+            // 创建Http Post请求
+            HttpGet httpGet = new HttpGet(url);
+            // 执行http请求
+            response = httpClient.execute(httpGet);
+            resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            assert response != null;
+            response.close();
+        }
+        return resultString;
+    }
+
+    private static RequestConfig builderRequestConfig() {
+        return RequestConfig.custom()
+                .setConnectTimeout(TIMEOUT_MSEC)
+                .setConnectionRequestTimeout(TIMEOUT_MSEC)
+                .setSocketTimeout(TIMEOUT_MSEC).build();
+    }
+}

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java

@@ -39,10 +39,9 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @PreAuthorize(hasPermi = "system:dept:list")
+//    @PreAuthorize(hasPermi = "system:dept:list")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
-    {
+    public AjaxResult list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(depts);
     }
@@ -109,6 +108,16 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/depts")
+    public AjaxResult depts(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDepts(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
     /**
      * 加载对应角色部门列表树
      */

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDeptMapper.java

@@ -30,6 +30,9 @@ public interface SysDeptMapper
      */
     public List<Integer> selectDeptListById(@Param("id") Long id, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
+
+    public List<SysDept> validateHasChirld(@Param("depts") List<SysDept> depts);
+
     /**
      * 根据部门ID查询信息
      * 

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDeptService.java

@@ -20,6 +20,14 @@ public interface ISysDeptService
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDepts(SysDept dept);
+
     /**
      * 构建前端所需要树结构
      * 

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -1,8 +1,6 @@
 package com.boman.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -42,8 +40,45 @@ public class SysDeptServiceImpl implements ISysDeptService
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptList(SysDept dept)
-    {
+    public List<SysDept> selectDeptList(SysDept dept) {
+        if(StringUtils.isNotEmpty(dept.getDeptName()) || StringUtils.isNotEmpty(dept.getStatus())) {
+            dept.setListByParentId(Boolean.TRUE);
+            return deptMapper.selectDeptList(dept);
+        }
+        Long id = dept.getId();
+        if(id == null) {
+            dept.setListByParentId(Boolean.FALSE);
+        }else{
+            dept.setListByParentId(Boolean.TRUE);
+            dept.setParentId(id);
+        }
+        List<SysDept> depts = deptMapper.selectDeptList(dept);
+        // 这里的逻辑是：根据id获取到这个下面的所有子部门，每个部门判断是否有下一级别
+        if(depts != null && depts.size() > 0) {
+            List<SysDept> hasChirlds = deptMapper.validateHasChirld(depts);
+            if(hasChirlds != null && hasChirlds.size() > 0) {
+                Map<Long, SysDept> hasChirldMap = new HashMap<>();
+                for (SysDept hasChirld : hasChirlds) {
+                    hasChirldMap.put(hasChirld.getId(), hasChirld);
+                }
+                for (SysDept sysDept : depts) {
+                    if(hasChirldMap.get(sysDept.getId()) == null) {
+                        sysDept.setHasChildren(Boolean.FALSE);
+                    }
+                }
+            }else {
+                for (SysDept sysDept : depts) {
+                    sysDept.setHasChildren(Boolean.FALSE);
+                }
+            }
+        }
+        return depts;
+    }
+
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDepts(SysDept dept) {
+        dept.setListByParentId(Boolean.TRUE);
         return deptMapper.selectDeptList(dept);
     }
 

boman-modules/boman-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="status"     column="status"      />
 		<result property="delFlag"    column="del_flag"    />
 		<result property="parentName" column="parent_name" />
+		<result property="num" column="num" />
 		<result property="createBy"   column="create_by"   />
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
@@ -30,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptList" parameterType="com.boman.domain.SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
+		<if test="listByParentId != null and listByParentId == false">
+			AND (parent_id is null or parent_id = 0)
+		</if>
         <if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
 		</if>
@@ -43,6 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
+
+	<select id="validateHasChirld" parameterType="java.util.List" resultMap="SysDeptResult">
+		SELECT a.id as id, count(1) as num FROM sys_dept a LEFT JOIN sys_dept b on a.id = b.parent_id WHERE b.parent_id in
+		<foreach collection="depts" item="dept" index="index" separator="," open="(" close=")">
+			#{dept.id}
+		</foreach>
+		GROUP BY a.id
+	</select>
     
     <select id="selectDeptListById" resultType="java.lang.Integer">
 		select d.id

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/IVaccineInfoUserService.java

@@ -1,5 +1,6 @@
 package com.boman.web.core.service.vaccineInfo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.boman.web.core.domain.VaccineInfoUser;
 
 import java.util.List;
@@ -25,5 +26,5 @@ public interface IVaccineInfoUserService {
     public List<VaccineInfoUser> selectInfoUserByIdCard(VaccineInfoUser vaccineInfoUser);
 
 
-    public void syncData() throws Exception;
+    public List<JSONObject> syncData() throws Exception;
 }

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoUserServiceImpl.java

@@ -69,7 +69,7 @@ public class VaccineInfoUserServiceImpl implements IVaccineInfoUserService {
      * 接种情况（是/否）
      * 人群分类
      */
-    public void syncData222() throws Exception {
+  /*  public void syncData222() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 获取疫苗信息，每次处理1000条
         int counts = syncMapper.selectCount("select count(1) from vaccine_info");
@@ -166,70 +166,53 @@ public class VaccineInfoUserServiceImpl implements IVaccineInfoUserService {
             count++;
             startPagte += 1000;
         }
-    }
+    }*/
 
 
     @Override
-    public void syncData() throws Exception {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+    public List<JSONObject> syncData() throws Exception {
+        List<JSONObject> datas = new ArrayList<>();
         try{
-            // 获取疫苗信息，每次处理1000条
-            int counts = syncMapper.selectCount("select count(1) from vaccine_info");
-            int count = 1;
-//        int counts = 1;
-            int times = counts / 1000;
-            int startPagte = 0;
-            int endPage = 1000;
-
-            for (int i = 0; i < times + 1; i++) {
-                List<JSONObject> vaccInfos = this.getVaccInfo(startPagte, endPage);
-                // 身份证号码
-                List<String> idCards = new ArrayList<>();
-                Map<String, JSONObject> vannInfoMap = new HashMap<>();
-
-                Map<String, String> progressMap = new HashMap<>();
-                for (JSONObject vanninfo : vaccInfos) {
-                    String idcard = vanninfo.getString("id_card");
-                    JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("id_card", idcard);
-                    progressMap.put(idcard, vanninfo.getString("progress"));
-                    vannInfoMap.put(idcard, jsonObject);
-                    idCards.add(idcard);
-                }
 
-                int secCount = 1;
-                // 查询疫苗是否完成
-                for (String icsard : idCards) {
-                    JSONObject update = vannInfoMap.get(icsard);
-                    JSONObject userInfo = this.getvaccUser(icsard);
-                    if (userInfo != null) {
-                        if(progressMap.get(icsard).equals("否")) {
-                            update.put("should_slow", "是");
-                        }else {
-                            update.put("should_slow", "否");
-                        }
-                        update.put("should_be", "否");
-                    } else {
+
+            List<JSONObject> jz = this.getvaccUser();
+            Map<String, JSONObject> vannInfoMap = new HashMap<>();
+
+            for (JSONObject jsonObject : jz) {
+                String idCard = jsonObject.getString("idCard");
+                JSONObject update = new JSONObject();
+                update.put("id_card", idCard);
+                vannInfoMap.put(idCard, update);
+            }
+            List<JSONObject> vaccInfos = this.getVaccInfo();
+            for (JSONObject vanninfo : vaccInfos) {
+                String idCard = vanninfo.getString("id_card");
+                JSONObject update = vannInfoMap.get(idCard);
+                String progress = vanninfo.getString("progress");
+                if(update == null) {
+                    update = new JSONObject();
+                    update.put("id_card", idCard);
+                    update.put("should_slow", "否");
+                    update.put("should_be", "是");
+                }else {
+                    if("否".equals(progress)) {
+                        update.put("should_slow", "是");
+                    }else {
                         update.put("should_slow", "否");
-                        update.put("should_be", "是");
                     }
-
-                    System.out.println("secCount: " + secCount);
-                    secCount++;
+                    update.put("should_be", "否");
                 }
-                this.updateData(new ArrayList(vannInfoMap.values()), count);
-                count++;
-                startPagte += 1000;
+                System.out.println(update.toJSONString());
+                datas.add(update);
             }
         }catch (Exception e) {
             e.printStackTrace();
         }
-
+        return datas;
     }
 
-    private List<JSONObject> getVaccInfo(int startPagte, int endPage) {
-        String sql = "select * from vaccine_info limit " + startPagte + ", " + endPage;
+    private List<JSONObject> getVaccInfo() {
+        String sql = "select id_card,progress from vaccine_info";
         List<JSONObject> objs = syncMapper.selectBySql(sql);
         return objs;
     }
@@ -248,7 +231,7 @@ public class VaccineInfoUserServiceImpl implements IVaccineInfoUserService {
         return objs;
     }
 
-    private JSONObject getvaccUser(String idcard) {
+    /*private JSONObject getvaccUser(String idcard) {
         String sql = "SELECT id,`接种日期` as v_date,`生产厂家` as prod,`接种针次` as jici, "
                 + " `人群分类` as crowd_classification, `接种单位` as vaccination_place," +
                 " `电话号码` as phone_num , `出生日期` as 'csrq', `工作单位` as work_unit,  `生产厂家` as manufacturer"
@@ -258,6 +241,13 @@ public class VaccineInfoUserServiceImpl implements IVaccineInfoUserService {
             return objs.get(0);
         }
         return null;
+    }*/
+
+    private List<JSONObject> getvaccUser() {
+        String sql = "SELECT `身份证` as idCard FROM ymjz ";
+        List<JSONObject> objs = syncMapper.selectBySql(sql);
+
+        return objs;
     }
 
     private String getTime(JSONObject userInfo, SimpleDateFormat sdf) throws Exception {

boman-wechat/src/main/java/com/boman/wechat/controller/AppletLoginController.java

@@ -136,5 +136,4 @@ public class AppletLoginController {
 
         return userEnv;
     }
-
 }

boman-wechat/src/main/resources/bootstrap-prod.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: boman-wechat
   profiles:
-    active: prode
+    active: prod
   cloud:
     nacos:
       discovery: