Skip to content

H
haoban-manage3.0
Commit bbd2eb54 by xugaojun
Options

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

parents c314aced 2841e0ee
Showing with 104 additions and 38 deletions
haoban-manage3-api/pom.xml
......@@ -46,8 +46,8 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
<artifactId>gic-commons</artifactId>
<version>${gic-commons}</version>
</dependency>
</dependencies>
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/NoticeMessageApiService.java
......@@ -19,6 +19,12 @@ public interface NoticeMessageApiService {
public void noticeMessageMq(String json);
/**
* 冗余
* @param json
*/
public void run(String json);
/**
* 消息分页
*1
* @param enterpriseId
......
haoban-manage3-operation-web/pom.xml
......@@ -39,6 +39,11 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
......@@ -107,11 +112,6 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/PendingTaskService.java
......@@ -81,5 +81,19 @@ public interface PendingTaskService {
*/
public boolean updateInvalidTimeByBusinessId(String businessId, Date time);
/**
* 完成
* @param relationId
* @return
*/
public boolean updateFinish(String relationId);
/**
* 完成
* @param task
* @return
*/
public boolean changeByRelationId(PendingTaskBO task);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/PendingTaskServiceImpl.java
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.notify.impl;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.util.StringUtil;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.manage.service.dao.mapper.PendingTaskMapper;
import com.gic.haoban.manage.service.entity.TabPendingTask;
......@@ -10,6 +11,7 @@ import com.gic.haoban.manage.service.pojo.bo.PendingTaskBO;
import com.gic.haoban.manage.service.service.notify.PendingTaskService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -111,4 +113,33 @@ public class PendingTaskServiceImpl implements PendingTaskService {
pendingTaskMapper.updateInvalidTimeByBusinessId(businessId, time);
return true;
}
@Override
public boolean updateFinish(String relationId) {
TabPendingTask pendingTask = pendingTaskMapper.getByRelationId(relationId);
if (null == pendingTask) {
return true;
}
pendingTask.setFinishFlag(1);
pendingTask.setFinishTime(new Date());
pendingTask.setUpdateTime(new Date());
pendingTaskMapper.updateByPrimaryKeySelective(pendingTask);
return true;
}
@Override
public boolean changeByRelationId(PendingTaskBO task) {
if (StringUtils.isBlank(task.getRelationId())) {
return false;
}
TabPendingTask pendingTask = pendingTaskMapper.getByRelationId(task.getRelationId());
if (null == pendingTask) {
return true;
}
TabPendingTask tabPendingTask = EntityUtil.changeEntityByJSON(TabPendingTask.class, task);
tabPendingTask.setId(pendingTask.getId());
tabPendingTask.setUpdateTime(new Date());
pendingTaskMapper.updateByPrimaryKeySelective(tabPendingTask);
return true;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java
......@@ -139,6 +139,10 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
sendMessage(contentList, wxEnterpriseId, wxUserId, messageTypeEnum, noticeMessageBO.getMessageContent());
}
@Override
public void run(String json) {
this.noticeMessageMq(json);
}
@Override
public ServiceResponse<Page<NoticeMessageInfoDTO>> pageNoticeMessage(String enterpriseId, String storeId, String clerkId, int categoryType, BasePageInfo pageInfo) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java
......@@ -128,10 +128,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
@Override
public ServiceResponse<Boolean> finishPending(String relationId) {
PendingTaskBO pendingTaskBO = new PendingTaskBO();
pendingTaskBO.setRelationId(relationId);
pendingTaskBO.setFinishFlag(1);
boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
boolean b = pendingTaskService.updateFinish(relationId);
return ServiceResponse.success(b);
}
......@@ -140,7 +137,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
PendingTaskBO pendingTaskBO = new PendingTaskBO();
pendingTaskBO.setRelationId(relationId);
pendingTaskBO.setClerkId(newExeutiveClerkId);
boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
return ServiceResponse.success(b);
}
......@@ -150,7 +147,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
pendingTaskBO.setRelationId(relationId);
pendingTaskBO.setClerkId(newExeutiveClerkId);
pendingTaskBO.setFinishFlag(1);
boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
return ServiceResponse.success(b);
}
......@@ -182,7 +179,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
PendingTaskBO pendingTaskBO = new PendingTaskBO();
pendingTaskBO.setRelationId(relationId);
pendingTaskBO.setInvalidTime(endTime);
boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
return ServiceResponse.success(b);
}
......
haoban-manage3-web/pom.xml
......@@ -37,6 +37,11 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
......@@ -86,6 +91,12 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.9</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
......@@ -120,11 +131,6 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java
......@@ -8,6 +8,8 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.qcloud.BucketNameEnum;
import com.gic.qcloud.FileUploadUtil;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -22,7 +24,7 @@ import java.util.Set;
@RestController
public class UploadController extends WebBaseController{
private static Logger logger= LoggerFactory.getLogger(UploadController.class);
private static Set<String> FILE_TYPE = new HashSet<>( );
static {
for(BucketNameEnum value: BucketNameEnum.values()){
......@@ -56,20 +58,26 @@ public class UploadController extends WebBaseController{
String key = "haoban/"+dayFilePath+"/"+name;
fileType = FILE_TYPE.contains( fileType )?fileType:BucketNameEnum.OTHER_90000.getName();
String url = FileUploadUtil.simpleUploadFileFromLocal( templateFile,key,fileType);
try {
String url = FileUploadUtil.simpleUploadFileFromLocal(templateFile, key, fileType);
if(templateFile != null){
templateFile.delete();
}
if (templateFile != null) {
templateFile.delete();
}
JSONObject res = new JSONObject( );
res.put( "name",name );
res.put( "mediaName",mediaName );
res.put( "ext", suffix );
res.put( "size",len );
res.put( "key",key );
res.put( "url", "https://"+url );
return resultResponse(HaoBanErrCode.ERR_1, res);
JSONObject res = new JSONObject();
res.put("name", name);
res.put("mediaName", mediaName);
res.put("ext", suffix);
res.put("size", len);
res.put("key", key);
res.put("url", "https://" + url);
return resultResponse(HaoBanErrCode.ERR_1, res);
}catch (Exception e) {
e.printStackTrace();
logger.info("异常:{}",e);
return resultResponse(HaoBanErrCode.ERR_0);
}
}
}
haoban-manage3-wx/pom.xml
......@@ -48,6 +48,11 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-wechat-api</artifactId>
<version>${gic-wechat-api}</version>
</dependency>
......@@ -113,11 +118,6 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -664,7 +664,7 @@ public class ClerkController extends WebBaseController {
//精确查，根据手机号或者code，查找
@RequestMapping("query-clerk-list-by-code")
public HaobanResponse queryClerkListByCode(String keyword, String wxEnterpriseId, String staffId) {
if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
if (StringUtils.isAnyBlank(staffId, wxEnterpriseId,keyword)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment