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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaidianDictPageDTO.java

@@ -17,11 +17,41 @@ public class MaidianDictPageDTO implements Serializable {
 
     private String operationPerson;
     
+    private Integer hideFlag;
+
+    private String code;
+
+    private String moduleData;
+    
     private List<MaidianDictDTO> pageList;
 
 
     private static final long serialVersionUID = 1L;
 
+    public Integer getHideFlag() {
+		return hideFlag;
+	}
+
+	public void setHideFlag(Integer hideFlag) {
+		this.hideFlag = hideFlag;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getModuleData() {
+		return moduleData;
+	}
+
+	public void setModuleData(String moduleData) {
+		this.moduleData = moduleData;
+	}
+
 	public List<MaidianDictDTO> getPageList() {
 		return pageList;
 	}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -21,7 +21,7 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
 	
-	List<MemberUnionidRelatedDTO> listByWxEnterpriseIdAndDate(String wxEnterpriseId,Date date);
+	List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
 
 	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java

@@ -32,7 +32,7 @@ public interface MemberUnionidRelatedMapper {
 
 	List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
 	
-	List<MemberUnionidRelated> listByWxEnterpriseIdAndDate(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("date")Date date);
+	List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
 	
 	MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("enterpriseId")String enterpriseId, 
 			@Param("externalName")String name, @Param("addCreateTime")String createTime);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java

@@ -48,6 +48,8 @@ public interface StaffDepartmentRelatedMapper {
 	
 	List<TabHaobanStaffDepartmentRelated> listByClerkCode(@Param("clerkCode")String clerkCode);
 
+	List<TabHaobanStaffDepartmentRelated> listByWxEnterpriseIdAndClerkCode(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("clerkCode")String clerkCode);
+
 	List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffIds(@Param("staffIds")List<String> staffIds);
 	
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaidianDictModuleMapper.java

@@ -15,9 +15,8 @@ public interface TabHaobanMaidianDictModuleMapper {
 
     int updateByPrimaryKeySelective(TabHaobanMaidianDictModule record);
 
-    int updateByPrimaryKeyWithBLOBs(TabHaobanMaidianDictModule record);
-
     int updateByPrimaryKey(TabHaobanMaidianDictModule record);
     
     List<TabHaobanMaidianDictModule> list();
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanMaidianDictModule.java

@@ -16,12 +16,12 @@ public class TabHaobanMaidianDictModule implements Serializable {
 
     private String operationPerson;
 
+    private String moduleData;
+
     private Integer hideFlag;
 
     private String code;
 
-    private String moduleData;
-
     private static final long serialVersionUID = 1L;
 
     public String getModuleId() {
@@ -72,6 +72,14 @@ public class TabHaobanMaidianDictModule implements Serializable {
         this.operationPerson = operationPerson == null ? null : operationPerson.trim();
     }
 
+    public String getModuleData() {
+        return moduleData;
+    }
+
+    public void setModuleData(String moduleData) {
+        this.moduleData = moduleData == null ? null : moduleData.trim();
+    }
+
     public Integer getHideFlag() {
         return hideFlag;
     }
@@ -87,12 +95,4 @@ public class TabHaobanMaidianDictModule implements Serializable {
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
     }
-
-    public String getModuleData() {
-        return moduleData;
-    }
-
-    public void setModuleData(String moduleData) {
-        this.moduleData = moduleData == null ? null : moduleData.trim();
-    }
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaterialApiServiceImpl.java

@@ -122,7 +122,9 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 			url = materialDTO.getLink();
 		}
 		if(fileType != null){
-			JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), getFileByte(url), fileType.getCode());
+			String[] arr = url.split("/");
+			int count = arr.length;
+			JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), getFileByte(url),arr[count - 1], fileType.getCode());
 			if(jp.getErrorCode() == 0){
 				materialDTO.setWxLastUploadTime(new Date());
 				materialDTO.setMediaId(jp.getResult().toString());
@@ -170,7 +172,9 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 			oldUrl = old.getLink();
 		}
 		if(fileType != null && !url.equals(oldUrl)){
-			JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), getFileByte(url), fileType.getCode());
+			String[] arr = url.split("/");
+			int count = arr.length;
+			JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), getFileByte(url),arr[count - 1], fileType.getCode());
 			if(jp.getErrorCode() == 0){
 				materialDTO.setWxLastUploadTime(new Date());
 				materialDTO.setMediaId(jp.getResult().toString());
@@ -209,7 +213,9 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 			fileType = QywxMediaTypeEnum.FILE;
 			url = old.getLink();
 		}
-		JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), getFileByte(url), fileType.getCode());
+		String[] arr = url.split("/");
+		int count = arr.length;
+		JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), getFileByte(url),arr[count - 1], fileType.getCode());
 		if(jp.getErrorCode() == 0){
 			old.setWxLastUploadTime(new Date());
 			old.setMediaId(jp.getResult().toString());
@@ -227,8 +233,9 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 	}
 	
 	public static void main(String[] args) {
-		String str = "{errcode=0, errmsg=ok, media_id=3ymUzyvUwcIohAXb1lbrL-6Fa-yD3njQpgFCYrEDUHpDaja_ZThd-6XW95NEVjY1l, created_at=1589335350, type=image}";
-		JSON.parseObject(str);
+		String str = "https://other-1251519181.cos.ap-shanghai.myqcloud.com/haoban/20200518101933/【④好办-数据】(1)(1).xlsx";
+		int count = str.split("/").length;
+		System.err.println(str.split("/")[count - 1]);
 	}
 	
 	private static byte[] getFileByte(String url) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -636,8 +636,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		return list;
 	}
 	@Override
-	public List<MemberUnionidRelatedDTO> listByWxEnterpriseIdAndDate( String wxEnterpriseId,Date date) {
-		List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByWxEnterpriseIdAndDate(wxEnterpriseId,date);
+	public List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate( String enterpriseId,Date date) {
+		List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByEnterpriseIdAndDate(enterpriseId,date);
 		return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class,list);
 	}
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java

@@ -29,9 +29,11 @@ import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
+import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanApplication;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.ApplicationService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
@@ -54,7 +56,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	private QywxSuiteApiService qywxSuiteApiService;
 	@Autowired
 	private WxEnterpriseMapper wxEnterpriseMapper;
-	
+	@Autowired
+	private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
 	@Autowired
 	private Config config;
 	
@@ -137,12 +140,18 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		if(StringUtil.isEmpty(clerkCode) ){
 			return map;
 		}
-		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedMapper.listByClerkCode(clerkCode);
+		String enterpriseId = clerkDTO.getEnterpriseId();
+		TabHaobanWxEnterpriseRelated relate = wxEnterpriseRelatedMapper.findOneByEnterpriseId(enterpriseId);
+		if(relate == null){
+			return map;
+		}
+		String wxEnterpriseId = relate.getWxEnterpriseId();
+		
+		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedMapper.listByWxEnterpriseIdAndClerkCode(wxEnterpriseId, clerkCode);
 		if(CollectionUtil.isEmpty(list)){
 			return map;
 		}
 		String wxUserId = list.get(0).getWxUserId();
-		String wxEnterpriseId = list.get(0).getWxEnterpriseId();
 		TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(wxEnterpriseId);
 		
 		map.put("wxUserId", wxUserId);

haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml

@@ -230,12 +230,12 @@
     and status_flag = 1
     and wx_enterprise_id = #{wxEnterpriseId}
   </select>
-     <select id="listByWxEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
+     <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_member_unionid_related
     where  status_flag = 1
-    and wx_enterprise_id = #{wxEnterpriseId}
+    and enterprise_id = #{enterpriseId}
     <if test="date != null" >
        and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP})
     </if>
@@ -275,6 +275,8 @@
     <foreach item="wxUserId" index="index" collection="userIdList" open="(" separator="," close=")">  
        #{wxUserId, jdbcType=CHAR}  
     </foreach>
+    and member_id is not null
+    group by external_userid
   </select>
   
   <select id="getByWxUserIdListAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >

haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml

@@ -249,6 +249,14 @@
     and status_flag = 1
   </select>
   
+     <select id="listByWxEnterpriseIdAndClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_department_related
+    where clerk_code = #{clerkCode}
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+  </select>
   
   <select id="countByDepartmentId" resultType="java.lang.Integer" parameterType="java.lang.String" >
     select 

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianDictModuleMapper.xml

@@ -8,24 +8,17 @@
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="status" property="status" jdbcType="INTEGER" />
     <result column="operation_person" property="operationPerson" jdbcType="VARCHAR" />
+    <result column="module_data" property="moduleData" jdbcType="VARCHAR" />
     <result column="hide_flag" property="hideFlag" jdbcType="INTEGER" />
     <result column="code" property="code" jdbcType="VARCHAR" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" extends="BaseResultMap" >
-    <result column="module_data" property="moduleData" jdbcType="LONGVARCHAR" />
-  </resultMap>
   <sql id="Base_Column_List" >
-    module_id, module_name, create_time, update_time, status, operation_person, hide_flag, 
-    code
-  </sql>
-  <sql id="Blob_Column_List" >
-    module_data
+    module_id, module_name, create_time, update_time, status, operation_person, module_data, 
+    hide_flag, code
   </sql>
-  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String" >
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from tab_haoban_maidian_dict_module
     where module_id = #{moduleId,jdbcType=VARCHAR}
   </select>
@@ -36,11 +29,11 @@
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
     insert into tab_haoban_maidian_dict_module (module_id, module_name, create_time, 
       update_time, status, operation_person, 
-      hide_flag, code, module_data
+      module_data, hide_flag, code
       )
     values (#{moduleId,jdbcType=VARCHAR}, #{moduleName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{operationPerson,jdbcType=VARCHAR}, 
-      #{hideFlag,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{moduleData,jdbcType=LONGVARCHAR}
+      #{moduleData,jdbcType=VARCHAR}, #{hideFlag,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
@@ -64,15 +57,15 @@
       <if test="operationPerson != null" >
         operation_person,
       </if>
+      <if test="moduleData != null" >
+        module_data,
+      </if>
       <if test="hideFlag != null" >
         hide_flag,
       </if>
       <if test="code != null" >
         code,
       </if>
-      <if test="moduleData != null" >
-        module_data,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="moduleId != null" >
@@ -93,15 +86,15 @@
       <if test="operationPerson != null" >
         #{operationPerson,jdbcType=VARCHAR},
       </if>
+      <if test="moduleData != null" >
+        #{moduleData,jdbcType=VARCHAR},
+      </if>
       <if test="hideFlag != null" >
         #{hideFlag,jdbcType=INTEGER},
       </if>
       <if test="code != null" >
         #{code,jdbcType=VARCHAR},
       </if>
-      <if test="moduleData != null" >
-        #{moduleData,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
@@ -122,30 +115,18 @@
       <if test="operationPerson != null" >
         operation_person = #{operationPerson,jdbcType=VARCHAR},
       </if>
+      <if test="moduleData != null" >
+        module_data = #{moduleData,jdbcType=VARCHAR},
+      </if>
       <if test="hideFlag != null" >
         hide_flag = #{hideFlag,jdbcType=INTEGER},
       </if>
       <if test="code != null" >
         code = #{code,jdbcType=VARCHAR},
       </if>
-      <if test="moduleData != null" >
-        module_data = #{moduleData,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where module_id = #{moduleId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
-    update tab_haoban_maidian_dict_module
-    set module_name = #{moduleName,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
-      operation_person = #{operationPerson,jdbcType=VARCHAR},
-      hide_flag = #{hideFlag,jdbcType=INTEGER},
-      code = #{code,jdbcType=VARCHAR},
-      module_data = #{moduleData,jdbcType=LONGVARCHAR}
-    where module_id = #{moduleId,jdbcType=VARCHAR}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
     update tab_haoban_maidian_dict_module
     set module_name = #{moduleName,jdbcType=VARCHAR},
@@ -153,11 +134,11 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER},
       operation_person = #{operationPerson,jdbcType=VARCHAR},
+      module_data = #{moduleData,jdbcType=VARCHAR},
       hide_flag = #{hideFlag,jdbcType=INTEGER},
       code = #{code,jdbcType=VARCHAR}
     where module_id = #{moduleId,jdbcType=VARCHAR}
   </update>
-  
         <select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
@@ -166,4 +147,5 @@
     order by create_time 
   </select>
   
+  
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java

@@ -36,7 +36,7 @@ public class MyApplicationContextAware implements ApplicationContextAware {
   	  QuartzTaskDTO taskDTO = new QuartzTaskDTO();
         taskDTO.setReferId(id);
         taskDTO.setTaskMethod("quartzUpdateMessageStatus");
-        taskDTO.setTaskService("com.gic.haoban.app.customer.service.api.service.messageLogApiService");
+        taskDTO.setTaskService("com.gic.haoban.app.customer.service.api.service.MessageLogApiService");
         return taskDTO;
 	}
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

 package com.gic.haoban.manage.web.controller;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
+import com.gic.commons.util.DateUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.common.utils.EntityUtil;
@@ -73,6 +76,31 @@ public class MaterialController extends WebBaseController{
     	return resultResponse(HaoBanErrCode.ERR_1,handerList);
     }
     
+    /**
+     * 素材查询
+     * @return
+     */
+    @RequestMapping("/reupdalod-material")
+    public HaobanResponse reUpdalodMetail(String materialId) {
+    	if(StringUtils.isBlank(materialId)){
+    		return resultResponse(HaoBanErrCode.ERR_10015);
+    	}
+    	MaterialDTO material = materialApiService.selectMaterialById(materialId);
+    	if(material == null){
+    		
+    	}
+    	String medialId = "";
+    	if(material.getMaterialType() == 2 || material.getMaterialType() == 4 || material.getMaterialType() == 5){
+			Date wxLastTime = material.getWxLastUploadTime();
+			medialId = material.getMediaId();
+			if(DateUtil.addDay(wxLastTime, 3).getTime() < System.currentTimeMillis()){
+				medialId = materialApiService.reUpdalodMetail(materialId);
+			}
+    	}
+    	return resultResponse(HaoBanErrCode.ERR_1,medialId);
+    }
+    
+    
     private void handerSonMaterial(List<MaterialVO> handerList,Map<String,List<MaterialCategoryDTO>> map){
     	for (MaterialVO materialVO : handerList) {
 			List<MaterialCategoryDTO> sonList = map.get(materialVO.getCategoryId());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -198,6 +198,8 @@ public enum HaoBanErrCode {
     ERR_10013(10013,"code已经存在"),
     ERR_10014(10014,"请输入手机号"),
     
+    ERR_10015(10015,"素材不存在"),
+
 
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),