Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/doc/db/2019-10-25.sql

@@ -1 +1 @@
-ALTER TABLE esd_admin.sys_menu ADD menu_code varchar(50) NULL COMMENT '菜单编码';
+ALTER TABLE esua_epdc_admin.sys_menu ADD menu_code varchar(50) NULL COMMENT '菜单编码';

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
 import com.elink.esua.epdc.service.WorkItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,9 @@ public class ApiWorkItemController {
      * @Author: liuchuang
      * @Date: 2019/9/12 13:26
      */
-    @GetMapping("statistics/{deptId}")
+    @GetMapping("statistics")
-    public Result<ItemStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable Long deptId) {
+    public Result<ItemStatisticsResultDTO> itemCategoryStatistics(ItemStatisticsFormDTO formDto) {
-        return workItemService.getItemStatistics(userDetail, deptId);
+        return workItemService.getItemStatistics(formDto);
     }
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -252,21 +252,23 @@ public interface UserFeignClient {
     @PostMapping("app-user/epdc-app/user/updateWxInfo")
     Result updateWxInfo(UserDTO userDTO);
 
-    /**
+	/**
-     * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+	 * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
-     * @param userId 用户Id
+	 *
-     * @return
+	 * @param userId 用户Id
-     */
+	 * @return
-    @GetMapping("app-user/epdc-app/user/residentDetail/{userId}")
+	 */
-    Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
+	@GetMapping("app-user/epdc-app/user/residentDetail/{userId}")
+	Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
 
 	/**
 	 * 认证用户（用户信息审核）
+	 *
 	 * @param formDTO
 	 * @return
 	 */
 	@PostMapping("app-user/epdc-app/user/authenticateResident")
-	  Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
+	Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
 
@@ -19,5 +20,5 @@ public interface WorkItemService {
      * @Author: lipengfei
      * @Date: 2019/11/18 13:27
      */
-    Result<ItemStatisticsResultDTO> getItemStatistics(TokenDto userDetail, Long deptId);
+    Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java

@@ -31,12 +31,7 @@ public class WorkItemServiceImpl implements WorkItemService {
      * @Date: 2019/11/18 13:27
      */
     @Override
-    public Result<ItemStatisticsResultDTO> getItemStatistics(TokenDto userDetail, Long deptId) {
+    public Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto) {
-        if (null == userDetail) {
-            return new Result<ItemStatisticsResultDTO>().error("获取用户信息失败");
-        }
-        ItemStatisticsFormDTO formDto = new ItemStatisticsFormDTO();
-        formDto.setDeptId(deptId);
         return workItemFeignClient.itemStatistics(formDto);
     }
 

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/controller/ImportInShiBeiController.java

@@ -0,0 +1,100 @@
+package com.elink.esua.epdc.controller;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.alibaba.fastjson.JSONObject;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.CharEncoding;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author work@yujt.net.cn
+ * @date 1 1
+ */
+@Slf4j
+@RestController
+@RequestMapping("inshibei")
+public class ImportInShiBeiController {
+
+
+    @GetMapping("coterie/batchSave")
+    public Result importExcel(MultipartFile file, String userId, String token) {
+        ImportParams importParams = new ImportParams();
+        importParams.setHeadRows(1);
+        try {
+            List<Map<String, String>> articleList = ExcelImportUtil.importExcel(file.getInputStream(), Map.class, importParams);
+
+            for (Map<String, String> objectMap : articleList) {
+                postWithParam(userId, token, objectMap.get("content"), objectMap.get("type"));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new Result();
+    }
+
+    private void postWithParam(String userId, String token, String detail, String type) throws Exception {
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+
+        JSONObject json = new JSONObject();
+        json.put("userId", userId);
+        json.put("token", token);
+        json.put("detail", detail);
+        json.put("coterieType", type);
+
+        HttpPost httpPost = new HttpPost("http://hxb.elinkit.com.cn/InShiBei/rest/coterie/save");
+        StringEntity stringEntity = new StringEntity(json.toJSONString(), CharEncoding.UTF_8);
+        stringEntity.setContentEncoding(CharEncoding.UTF_8);
+        // 发送json数据需要设置contentType
+        stringEntity.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+        httpPost.setEntity(stringEntity);
+
+        getStringResult(httpClient.execute(httpPost));
+    }
+
+
+    private static String getStringResult(CloseableHttpResponse response) {
+        String result = null;
+        try {
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                HttpEntity httpEntity = response.getEntity();
+                result = EntityUtils.toString(httpEntity, CharEncoding.UTF_8);
+            } else {
+                log.error("拉取失败,错误编码为：" + response.getStatusLine().getStatusCode());
+            }
+        } catch (ParseException e) {
+            log.error("getResult方法格式转换异常ParseException");
+            e.printStackTrace();
+        } catch (IOException e) {
+            log.error("getResult方法IO异常IOException");
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != response) {
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java

@@ -23,7 +23,6 @@ public class ItemStatisticsFormDTO implements Serializable {
     /**
      * 部门ID列表
      */
-    @NotNull(message = "部门ID列表不能为空")
     List<Long> deptIdList;
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/workItemController.java

@@ -34,7 +34,6 @@ public class workItemController {
      */
     @GetMapping("statistics")
     public Result<ItemStatisticsResultDTO> itemStatistics(@RequestBody ItemStatisticsFormDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
         formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList());
         return this.itemService.getItemStatistics(formDto);
     }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -620,6 +620,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
     @Override
     public Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto) {
+
         ItemStatisticsResultDTO resultDTO = baseDao.selectOneItemStatistics(formDto);
         return new Result<ItemStatisticsResultDTO>().ok(resultDTO);
     }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -591,12 +591,11 @@
            WHERE
 	           item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '0'
-        <if test="deptIdList != null">
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-        </if>
+
         <if test='formDto.deptId != null and formDto.deptId != ""'>
             AND dept.DEPT_ID = #{formDto.deptId}
         </if>
@@ -613,12 +612,10 @@
            WHERE
 	           item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '10'
-        <if test="deptIdList != null">
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-        </if>
         <if test='formDto.deptId != null and formDto.deptId != ""'>
             AND dept.DEPT_ID = #{formDto.deptId}
         </if>
@@ -634,12 +631,11 @@
            WHERE
            item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '5'
-        <if test="deptIdList != null">
+
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-        </if>
         <if test='formDto.deptId != null and formDto.deptId != ""'>
             AND dept.DEPT_ID = #{formDto.deptId}
         </if>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -258,7 +258,7 @@ public class EpdcAppUserController {
      * @return
      */
     @GetMapping("residentDetail/{userId}")
-    public Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId){
+    public Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId) {
         return userService.residentDetail(userId);
     }
 
@@ -277,10 +277,10 @@ public class EpdcAppUserController {
 	 * @param formDTO
 	 * @return
 	 */
-	@PostMapping("authenticateResident")
+    @PostMapping("authenticateResident")
-		public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){
+    public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
-			return userService.authenticateResident(formDTO);
+        return userService.authenticateResident(formDTO);
-		}
+    }
     /***
      * 用户列表
      * @param workUserFromDto

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -508,7 +508,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      */
     @Override
     public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
-        if(StringUtils.isBlank(userId)){
+        if (StringUtils.isBlank(userId)) {
             return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空");
         }
         EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
@@ -522,19 +522,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      */
     @Override
     public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
-    	if(StringUtils.isBlank(formDTO.getAuthenticatedFlag())){
+        if (StringUtils.isBlank(formDTO.getAuthenticatedFlag())) {
-    		formDTO.setAuthenticatedFlag("0");
+            formDTO.setAuthenticatedFlag(YesOrNoEnum.NO.value());
-	    }
+        }
-      UserDTO userDTO=this.get(formDTO.getUserId());
+        UserDTO userDTO = this.get(formDTO.getUserId());
-      if(null!=userDTO){
+        if (null != userDTO) {
-          if("0".equals(formDTO.getAuthenticatedFlag())){//不通过
+            if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过
-              userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+                userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
-          }else if("1".equals(formDTO.getAuthenticatedFlag())){//通过
+            } else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过
-              userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+                userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
-          }
+            } else {
-          this.update(userDTO);
+                throw new RenException("是否认证通过数据不匹配");
-      }
+            }
-      return new Result();
+            this.update(userDTO);
+        }
+        return new Result();
     }
 
     /**

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -237,6 +237,30 @@
             AND epaf.DEL_FLAG = '0'
             AND eu.ID = #{userId}
     </select>
+    <select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+        SELECT
+        u.ID as userId,
+        u.NICKNAME as nickname,
+        u.REGISTER_TIME as registerTime,
+        u.FACE_IMG as faceImg
+        FROM
+        epdc_user_grid_relation ug_l
+        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
+        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
+        WHERE
+        ug_l.USER_ID = #{userId}
+        AND ug_l.LEADER_FLAG = '1'
+        AND u.STATE = #{authenticatedFlag}
+        <if test='allGridFlag=="0"'>
+            AND ug_r.GRID_ID = #{deptId}
+        </if>
+        AND u.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+        GROUP BY
+        u.ID
+        ORDER BY
+        u.CREATED_TIME DESC
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 
     <!-- 通过用户ID获取党员身份证号 -->
     <select id="getPartyMemberIdNoByUserID" resultType="java.lang.String">