Skip to content

S
smart_gov_platform
Commit dde01f6e authored by 赵啸非's avatar 赵啸非
Browse files
Options

统计部门入驻事项

parent 0c722e91
Hide whitespace changes
Inline Side-by-side
Showing with 712 additions and 594 deletions
base-manager/src/main/java/com/mortals/xhx/base/framework/config/FilterConfig.java
View file @ dde01f6e
...@@ -47,17 +47,6 @@ public class FilterConfig { ...@@ -47,17 +47,6 @@ public class FilterConfig {
return registration; return registration;
} }
@SuppressWarnings({"rawtypes", "unchecked"})
/* @Bean
public FilterRegistrationBean someFilterRegistration() {
FilterRegistrationBean registration = new FilterRegistrationBean();
registration.setFilter(new RepeatableFilter());
registration.addUrlPatterns("/*");
registration.setName("repeatableFilter");
registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
return registration;
}*/
@Bean @Bean
public FilterRegistrationBean requestReplaceFilterRegistration() { public FilterRegistrationBean requestReplaceFilterRegistration() {
FilterRegistrationBean registrationBean = new FilterRegistrationBean(); FilterRegistrationBean registrationBean = new FilterRegistrationBean();
......
base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
View file @ dde01f6e
...@@ -3,17 +3,13 @@ package com.mortals.xhx.busiz.web; ...@@ -3,17 +3,13 @@ package com.mortals.xhx.busiz.web;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.mortals.framework.annotation.TokenBucketLimit;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.ParamDto; import com.mortals.framework.model.ParamDto;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.code.DxTypeEnum;
import com.mortals.xhx.common.code.SourceEnum; import com.mortals.xhx.common.code.SourceEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.keys.RedisCacheKeys;
import com.mortals.xhx.module.business.model.BusinessMatterEntity; import com.mortals.xhx.module.business.model.BusinessMatterEntity;
import com.mortals.xhx.module.business.model.BusinessMatterQuery; import com.mortals.xhx.module.business.model.BusinessMatterQuery;
import com.mortals.xhx.module.business.service.BusinessMatterService; import com.mortals.xhx.module.business.service.BusinessMatterService;
...@@ -22,7 +18,6 @@ import com.mortals.xhx.module.dept.model.DeptQuery; ...@@ -22,7 +18,6 @@ import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery; import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.model.vo.MatterInfo;
import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.model.SiteMatterEntity; import com.mortals.xhx.module.site.model.SiteMatterEntity;
...@@ -30,11 +25,12 @@ import com.mortals.xhx.module.site.model.SiteMatterQuery; ...@@ -30,11 +25,12 @@ import com.mortals.xhx.module.site.model.SiteMatterQuery;
import com.mortals.xhx.module.site.service.SiteMatterService; import com.mortals.xhx.module.site.service.SiteMatterService;
import com.mortals.xhx.module.site.service.SiteThemeMatterService; import com.mortals.xhx.module.site.service.SiteThemeMatterService;
import com.mortals.xhx.module.site.service.SiteThemeService; import com.mortals.xhx.module.site.service.SiteThemeService;
import com.mortals.xhx.module.window.model.*; import com.mortals.xhx.module.window.model.WindowEntity;
import com.mortals.xhx.module.window.service.WindowBusinessService; import com.mortals.xhx.module.window.model.WindowMatterEntity;
import com.mortals.xhx.module.window.model.WindowMatterQuery;
import com.mortals.xhx.module.window.model.WindowQuery;
import com.mortals.xhx.module.window.service.WindowMatterService; import com.mortals.xhx.module.window.service.WindowMatterService;
import com.mortals.xhx.module.window.service.WindowService; import com.mortals.xhx.module.window.service.WindowService;
import lombok.extern.apachecommons.CommonsLog;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.CookieStore; import org.apache.http.client.CookieStore;
...@@ -51,12 +47,12 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -51,12 +47,12 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
/** /**
* 测试接口 * 测试接口
* *
...@@ -86,6 +82,8 @@ public class DemoWebApiController { ...@@ -86,6 +82,8 @@ public class DemoWebApiController {
private BusinessMatterService businessMatterService; private BusinessMatterService businessMatterService;
@PostMapping(value = "testGov") @PostMapping(value = "testGov")
@UnAuth @UnAuth
public Rest<String> testGov(@RequestBody MatterQuery query) { public Rest<String> testGov(@RequestBody MatterQuery query) {
...@@ -324,6 +322,23 @@ public class DemoWebApiController { ...@@ -324,6 +322,23 @@ public class DemoWebApiController {
} }
@PostMapping(value = "limit")
@UnAuth
@TokenBucketLimit
public Rest<String> limit() {
log.info("limit in");
try {
String tableName="mortals_sys_area";
//CacheDataUtil.getInstance().getBaseData()
return Rest.ok();
} catch (Exception e) {
log.error("异常：", e.getMessage());
return Rest.fail(e.getMessage());
}
}
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(1001 / 500); System.out.println(1001 / 500);
......
base-manager/src/main/java/com/mortals/xhx/daemon/task/StatSiteDeptMatterTaskImpl.java
View file @ dde01f6e
...@@ -6,6 +6,7 @@ import com.mortals.framework.service.ICacheService; ...@@ -6,6 +6,7 @@ import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.ITask; import com.mortals.framework.service.ITask;
import com.mortals.framework.service.ITaskExcuteService; import com.mortals.framework.service.ITaskExcuteService;
import com.mortals.xhx.common.code.SourceEnum; import com.mortals.xhx.common.code.SourceEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.keys.RedisCacheKeys; import com.mortals.xhx.common.keys.RedisCacheKeys;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery; import com.mortals.xhx.module.dept.model.DeptQuery;
...@@ -40,6 +41,8 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService { ...@@ -40,6 +41,8 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
@Autowired @Autowired
private ICacheService cacheService; private ICacheService cacheService;
@Autowired
private SiteMatterService siteMatterService;
@Autowired @Autowired
private SiteThemeService siteThemeService; private SiteThemeService siteThemeService;
...@@ -62,6 +65,15 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService { ...@@ -62,6 +65,15 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
DeptEntity deptQuery = new DeptEntity(); DeptEntity deptQuery = new DeptEntity();
deptQuery.setTotal(total); deptQuery.setTotal(total);
deptQuery.setUpdateTime(new Date()); deptQuery.setUpdateTime(new Date());
//统计入驻事项
SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
siteMatterQuery.setDeptName(deptEntity.getDeptNumber());
siteMatterQuery.setSource(SourceEnum.政务网.getValue());
siteMatterQuery.setHallCheckIn(YesNoEnum.YES.getValue());
int incount = siteMatterService.count(siteMatterQuery, null);
deptQuery.setInNum(incount);
DeptEntity condition = new DeptEntity(); DeptEntity condition = new DeptEntity();
condition.setId(deptEntity.getId()); condition.setId(deptEntity.getId());
deptService.getDao().update(deptQuery, condition); deptService.getDao().update(deptQuery, condition);
...@@ -72,7 +84,7 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService { ...@@ -72,7 +84,7 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
Map<String, List<SiteThemeEntity>> collect = siteThemeService.find(new SiteThemeQuery()) Map<String, List<SiteThemeEntity>> collect = siteThemeService.find(new SiteThemeQuery())
.parallelStream() .parallelStream()
.collect(Collectors.groupingBy(x -> x.getSiteId() + "_" + x.getUserType() + "_" + x.getThemeCode() .collect(Collectors.groupingBy(x -> x.getSiteId() + "_" + x.getUserType() + "_" + x.getThemeCode()
)); ));
Iterator<Map.Entry<String, List<SiteThemeEntity>>> iterator = collect.entrySet().iterator(); Iterator<Map.Entry<String, List<SiteThemeEntity>>> iterator = collect.entrySet().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
Map.Entry<String, List<SiteThemeEntity>> next = iterator.next(); Map.Entry<String, List<SiteThemeEntity>> next = iterator.next();
......
base-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java
View file @ dde01f6e
package com.mortals.xhx.module.dept.model; package com.mortals.xhx.module.dept.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.dept.model.vo.DeptVo; import com.mortals.xhx.module.dept.model.vo.DeptVo;
import lombok.Data;
/** /**
* 部门实体对象 * 部门实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-06 * @date 2024-04-24
*/ */
@Data
public class DeptEntity extends DeptVo { public class DeptEntity extends DeptVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -44,7 +46,6 @@ public class DeptEntity extends DeptVo { ...@@ -44,7 +46,6 @@ public class DeptEntity extends DeptVo {
/** /**
* 部门电话 * 部门电话
*/ */
@JsonInclude(JsonInclude.Include.ALWAYS)
private String deptTelphone; private String deptTelphone;
/** /**
* 部门编号 * 部门编号
...@@ -90,266 +91,10 @@ public class DeptEntity extends DeptVo { ...@@ -90,266 +91,10 @@ public class DeptEntity extends DeptVo {
* 关联事项数量 * 关联事项数量
*/ */
private Integer total; private Integer total;
public DeptEntity(){}
/**
* 获取 从政务系统来的部门id
* @return String
*/
public String getTid(){
return tid;
}
/**
* 设置 从政务系统来的部门id
* @param tid
*/
public void setTid(String tid){
this.tid = tid;
}
/**
* 获取 从政务系统来的部门name
* @return String
*/
public String getTname(){
return tname;
}
/**
* 设置 从政务系统来的部门name
* @param tname
*/
public void setTname(String tname){
this.tname = tname;
}
/**
* 获取 部门名称
* @return String
*/
public String getName(){
return name;
}
/**
* 设置 部门名称
* @param name
*/
public void setName(String name){
this.name = name;
}
/**
* 获取 从政务系统来的别名
* @return String
*/
public String getSimpleName(){
return simpleName;
}
/**
* 设置 从政务系统来的别名
* @param simpleName
*/
public void setSimpleName(String simpleName){
this.simpleName = simpleName;
}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 部门简称
* @return String
*/
public String getDeptAbb(){
return deptAbb;
}
/**
* 设置 部门简称
* @param deptAbb
*/
public void setDeptAbb(String deptAbb){
this.deptAbb = deptAbb;
}
/**
* 获取 部门电话
* @return String
*/
public String getDeptTelphone(){
return deptTelphone;
}
/**
* 设置 部门电话
* @param deptTelphone
*/
public void setDeptTelphone(String deptTelphone){
this.deptTelphone = deptTelphone;
}
/**
* 获取 部门编号
* @return String
*/
public String getDeptNumber(){
return deptNumber;
}
/**
* 设置 部门编号
* @param deptNumber
*/
public void setDeptNumber(String deptNumber){
this.deptNumber = deptNumber;
}
/**
* 获取 填单机展示 (0.否，1.是)
* @return Integer
*/
public Integer getIsAutotable(){
return isAutotable;
}
/**
* 设置 填单机展示 (0.否，1.是)
* @param isAutotable
*/
public void setIsAutotable(Integer isAutotable){
this.isAutotable = isAutotable;
}
/**
* 获取 预约展示 (0.否，1.是)
* @return Integer
*/
public Integer getIsOrder(){
return isOrder;
}
/**
* 设置 预约展示 (0.否，1.是)
* @param isOrder
*/
public void setIsOrder(Integer isOrder){
this.isOrder = isOrder;
}
/**
* 获取 背靠背展示 (0.否，1.是)
* @return Integer
*/
public Integer getIsBkb(){
return isBkb;
}
/** /**
* 设置 背靠背展示 (0.否，1.是) * 入驻事项数量
* @param isBkb
*/ */
public void setIsBkb(Integer isBkb){ private Integer inNum;
this.isBkb = isBkb;
}
/**
* 获取 办事指南展示 (0.否，1.是)
* @return Integer
*/
public Integer getIsWorkGuide(){
return isWorkGuide;
}
/**
* 设置 办事指南展示 (0.否，1.是)
* @param isWorkGuide
*/
public void setIsWorkGuide(Integer isWorkGuide){
this.isWorkGuide = isWorkGuide;
}
/**
* 获取 是否使用 (0.否，1.是)
* @return Integer
*/
public Integer getUsValid(){
return usValid;
}
/**
* 设置 是否使用 (0.否，1.是)
* @param usValid
*/
public void setUsValid(Integer usValid){
this.usValid = usValid;
}
/**
* 获取 部门电话是否展示 (0.否，1.是)
* @return Integer
*/
public Integer getIsSecphone(){
return isSecphone;
}
/**
* 设置 部门电话是否展示 (0.否，1.是)
* @param isSecphone
*/
public void setIsSecphone(Integer isSecphone){
this.isSecphone = isSecphone;
}
/**
* 获取 是否展示英文 (0.否，1.是)
* @return Integer
*/
public Integer getIsEnglish(){
return isEnglish;
}
/**
* 设置 是否展示英文 (0.否，1.是)
* @param isEnglish
*/
public void setIsEnglish(Integer isEnglish){
this.isEnglish = isEnglish;
}
/**
* 获取 排序
* @return Integer
*/
public Integer getSort(){
return sort;
}
/**
* 设置 排序
* @param sort
*/
public void setSort(Integer sort){
this.sort = sort;
}
/**
* 获取 部门来源
* @return Integer
*/
public Integer getSource(){
return source;
}
/**
* 设置 部门来源
* @param source
*/
public void setSource(Integer source){
this.source = source;
}
/**
* 获取 关联事项数量
* @return Integer
*/
public Integer getTotal(){
return total;
}
/**
* 设置 关联事项数量
* @param total
*/
public void setTotal(Integer total){
this.total = total;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -366,65 +111,25 @@ public class DeptEntity extends DeptVo { ...@@ -366,65 +111,25 @@ public class DeptEntity extends DeptVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",tid:").append(getTid());
sb.append(",tname:").append(getTname());
sb.append(",name:").append(getName());
sb.append(",simpleName:").append(getSimpleName());
sb.append(",siteId:").append(getSiteId());
sb.append(",deptAbb:").append(getDeptAbb());
sb.append(",deptTelphone:").append(getDeptTelphone());
sb.append(",deptNumber:").append(getDeptNumber());
sb.append(",isAutotable:").append(getIsAutotable());
sb.append(",isOrder:").append(getIsOrder());
sb.append(",isBkb:").append(getIsBkb());
sb.append(",isWorkGuide:").append(getIsWorkGuide());
sb.append(",usValid:").append(getUsValid());
sb.append(",isSecphone:").append(getIsSecphone());
sb.append(",isEnglish:").append(getIsEnglish());
sb.append(",sort:").append(getSort());
sb.append(",source:").append(getSource());
sb.append(",total:").append(getTotal());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.tid = "";
this.tid = null;
this.tname = ""; this.tname = "";
this.name = ""; this.name = "";
this.simpleName = ""; this.simpleName = "";
this.siteId = null; this.siteId = null;
this.deptAbb = ""; this.deptAbb = "";
this.deptTelphone = ""; this.deptTelphone = "";
this.deptNumber = ""; this.deptNumber = "";
this.isAutotable = 1; this.isAutotable = 1;
this.isOrder = 1; this.isOrder = 1;
this.isBkb = 1; this.isBkb = 1;
this.isWorkGuide = 1; this.isWorkGuide = 1;
this.usValid = 1; this.usValid = 1;
this.isSecphone = 1; this.isSecphone = 1;
this.isEnglish = 1; this.isEnglish = 1;
this.sort = 0; this.sort = 0;
this.source = 0; this.source = 0;
this.total = 0; this.total = 0;
this.inNum = 0;
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptQuery.java
View file @ dde01f6e
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.dept.model.DeptEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.dept.model.DeptEntity;
* 部门查询对象 * 部门查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-06 * @date 2024-04-24
*/ */
public class DeptQuery extends DeptEntity { public class DeptQuery extends DeptEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -209,6 +209,36 @@ public class DeptQuery extends DeptEntity { ...@@ -209,6 +209,36 @@ public class DeptQuery extends DeptEntity {
/** 部门来源排除列表 */ /** 部门来源排除列表 */
private List <Integer> sourceNotList; private List <Integer> sourceNotList;
/** 开始 关联事项数量 */
private Integer totalStart;
/** 结束 关联事项数量 */
private Integer totalEnd;
/** 增加 关联事项数量 */
private Integer totalIncrement;
/** 关联事项数量列表 */
private List <Integer> totalList;
/** 关联事项数量排除列表 */
private List <Integer> totalNotList;
/** 开始 入驻事项数量 */
private Integer inNumStart;
/** 结束 入驻事项数量 */
private Integer inNumEnd;
/** 增加 入驻事项数量 */
private Integer inNumIncrement;
/** 入驻事项数量列表 */
private List <Integer> inNumList;
/** 入驻事项数量排除列表 */
private List <Integer> inNumNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -236,21 +266,6 @@ public class DeptQuery extends DeptEntity { ...@@ -236,21 +266,6 @@ public class DeptQuery extends DeptEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 关联事项数量 */
private Integer totalStart;
/** 结束 关联事项数量 */
private Integer totalEnd;
/** 增加 关联事项数量 */
private Integer totalIncrement;
/** 关联事项数量列表 */
private List <Integer> totalList;
/** 关联事项数量排除列表 */
private List <Integer> totalNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<DeptQuery> orConditionList; private List<DeptQuery> orConditionList;
...@@ -1374,6 +1389,168 @@ public class DeptQuery extends DeptEntity { ...@@ -1374,6 +1389,168 @@ public class DeptQuery extends DeptEntity {
} }
/**
* 获取 开始 关联事项数量
* @return totalStart
*/
public Integer getTotalStart(){
return this.totalStart;
}
/**
* 设置 开始 关联事项数量
* @param totalStart
*/
public void setTotalStart(Integer totalStart){
this.totalStart = totalStart;
}
/**
* 获取 结束 关联事项数量
* @return $totalEnd
*/
public Integer getTotalEnd(){
return this.totalEnd;
}
/**
* 设置 结束 关联事项数量
* @param totalEnd
*/
public void setTotalEnd(Integer totalEnd){
this.totalEnd = totalEnd;
}
/**
* 获取 增加 关联事项数量
* @return totalIncrement
*/
public Integer getTotalIncrement(){
return this.totalIncrement;
}
/**
* 设置 增加 关联事项数量
* @param totalIncrement
*/
public void setTotalIncrement(Integer totalIncrement){
this.totalIncrement = totalIncrement;
}
/**
* 获取 关联事项数量
* @return totalList
*/
public List<Integer> getTotalList(){
return this.totalList;
}
/**
* 设置 关联事项数量
* @param totalList
*/
public void setTotalList(List<Integer> totalList){
this.totalList = totalList;
}
/**
* 获取 关联事项数量
* @return totalNotList
*/
public List<Integer> getTotalNotList(){
return this.totalNotList;
}
/**
* 设置 关联事项数量
* @param totalNotList
*/
public void setTotalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
}
/**
* 获取 开始 入驻事项数量
* @return inNumStart
*/
public Integer getInNumStart(){
return this.inNumStart;
}
/**
* 设置 开始 入驻事项数量
* @param inNumStart
*/
public void setInNumStart(Integer inNumStart){
this.inNumStart = inNumStart;
}
/**
* 获取 结束 入驻事项数量
* @return $inNumEnd
*/
public Integer getInNumEnd(){
return this.inNumEnd;
}
/**
* 设置 结束 入驻事项数量
* @param inNumEnd
*/
public void setInNumEnd(Integer inNumEnd){
this.inNumEnd = inNumEnd;
}
/**
* 获取 增加 入驻事项数量
* @return inNumIncrement
*/
public Integer getInNumIncrement(){
return this.inNumIncrement;
}
/**
* 设置 增加 入驻事项数量
* @param inNumIncrement
*/
public void setInNumIncrement(Integer inNumIncrement){
this.inNumIncrement = inNumIncrement;
}
/**
* 获取 入驻事项数量
* @return inNumList
*/
public List<Integer> getInNumList(){
return this.inNumList;
}
/**
* 设置 入驻事项数量
* @param inNumList
*/
public void setInNumList(List<Integer> inNumList){
this.inNumList = inNumList;
}
/**
* 获取 入驻事项数量
* @return inNumNotList
*/
public List<Integer> getInNumNotList(){
return this.inNumNotList;
}
/**
* 设置 入驻事项数量
* @param inNumNotList
*/
public void setInNumNotList(List<Integer> inNumNotList){
this.inNumNotList = inNumNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1519,87 +1696,6 @@ public class DeptQuery extends DeptEntity { ...@@ -1519,87 +1696,6 @@ public class DeptQuery extends DeptEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 关联事项数量
* @return totalStart
*/
public Integer getTotalStart(){
return this.totalStart;
}
/**
* 设置 开始 关联事项数量
* @param totalStart
*/
public void setTotalStart(Integer totalStart){
this.totalStart = totalStart;
}
/**
* 获取 结束 关联事项数量
* @return $totalEnd
*/
public Integer getTotalEnd(){
return this.totalEnd;
}
/**
* 设置 结束 关联事项数量
* @param totalEnd
*/
public void setTotalEnd(Integer totalEnd){
this.totalEnd = totalEnd;
}
/**
* 获取 增加 关联事项数量
* @return totalIncrement
*/
public Integer getTotalIncrement(){
return this.totalIncrement;
}
/**
* 设置 增加 关联事项数量
* @param totalIncrement
*/
public void setTotalIncrement(Integer totalIncrement){
this.totalIncrement = totalIncrement;
}
/**
* 获取 关联事项数量
* @return totalList
*/
public List<Integer> getTotalList(){
return this.totalList;
}
/**
* 设置 关联事项数量
* @param totalList
*/
public void setTotalList(List<Integer> totalList){
this.totalList = totalList;
}
/**
* 获取 关联事项数量
* @return totalNotList
*/
public List<Integer> getTotalNotList(){
return this.totalNotList;
}
/**
* 设置 关联事项数量
* @param totalNotList
*/
public void setTotalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2327,116 +2423,170 @@ public class DeptQuery extends DeptEntity { ...@@ -2327,116 +2423,170 @@ public class DeptQuery extends DeptEntity {
return this; return this;
} }
/**
* 设置 关联事项数量
* @param total
*/
public DeptQuery total(Integer total){
setTotal(total);
return this;
}
/** /**
* 设置 创建用户 * 设置 开始 关联事项数量
* @param createUserId * @param totalStart
*/ */
public DeptQuery createUserId(Long createUserId){ public DeptQuery totalStart(Integer totalStart){
setCreateUserId(createUserId); this.totalStart = totalStart;
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 结束 关联事项数量
* @param createUserIdStart * @param totalEnd
*/ */
public DeptQuery createUserIdStart(Long createUserIdStart){ public DeptQuery totalEnd(Integer totalEnd){
this.createUserIdStart = createUserIdStart; this.totalEnd = totalEnd;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 增加 关联事项数量
* @param createUserIdEnd * @param totalIncrement
*/ */
public DeptQuery createUserIdEnd(Long createUserIdEnd){ public DeptQuery totalIncrement(Integer totalIncrement){
this.createUserIdEnd = createUserIdEnd; this.totalIncrement = totalIncrement;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 关联事项数量
* @param createUserIdIncrement * @param totalList
*/ */
public DeptQuery createUserIdIncrement(Long createUserIdIncrement){ public DeptQuery totalList(List<Integer> totalList){
this.createUserIdIncrement = createUserIdIncrement; this.totalList = totalList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 关联事项数量
* @param createUserIdList * @param totalNotList
*/ */
public DeptQuery createUserIdList(List<Long> createUserIdList){ public DeptQuery totalNotList(List<Integer> totalNotList){
this.createUserIdList = createUserIdList; this.totalNotList = totalNotList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 入驻事项数量
* @param createUserIdNotList * @param inNum
*/ */
public DeptQuery createUserIdNotList(List<Long> createUserIdNotList){ public DeptQuery inNum(Integer inNum){
this.createUserIdNotList = createUserIdNotList; setInNum(inNum);
return this; return this;
} }
/**
* 设置 开始 入驻事项数量
* @param inNumStart
*/
public DeptQuery inNumStart(Integer inNumStart){
this.inNumStart = inNumStart;
return this;
}
/** /**
* 设置 关联事项数量 * 设置 结束 入驻事项数量
* @param total * @param inNumEnd
*/ */
public DeptQuery total(Integer total){ public DeptQuery inNumEnd(Integer inNumEnd){
setTotal(total); this.inNumEnd = inNumEnd;
return this; return this;
} }
/** /**
* 设置 开始 关联事项数量 * 设置 增加 入驻事项数量
* @param totalStart * @param inNumIncrement
*/ */
public DeptQuery totalStart(Integer totalStart){ public DeptQuery inNumIncrement(Integer inNumIncrement){
this.totalStart = totalStart; this.inNumIncrement = inNumIncrement;
return this; return this;
} }
/** /**
* 设置 结束 关联事项数量 * 设置 入驻事项数量
* @param totalEnd * @param inNumList
*/ */
public DeptQuery totalEnd(Integer totalEnd){ public DeptQuery inNumList(List<Integer> inNumList){
this.totalEnd = totalEnd; this.inNumList = inNumList;
return this; return this;
} }
/** /**
* 设置 增加 关联事项数量 * 设置 入驻事项数量
* @param totalIncrement * @param inNumNotList
*/ */
public DeptQuery totalIncrement(Integer totalIncrement){ public DeptQuery inNumNotList(List<Integer> inNumNotList){
this.totalIncrement = totalIncrement; this.inNumNotList = inNumNotList;
return this; return this;
} }
/** /**
* 设置 关联事项数量 * 设置 创建用户
* @param totalList * @param createUserId
*/ */
public DeptQuery totalList(List<Integer> totalList){ public DeptQuery createUserId(Long createUserId){
this.totalList = totalList; setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 关联事项数量 * 设置 开始 创建用户
* @param totalNotList * @param createUserIdStart
*/ */
public DeptQuery totalNotList(List<Integer> totalNotList){ public DeptQuery createUserIdStart(Long createUserIdStart){
this.totalNotList = totalNotList; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public DeptQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public DeptQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public DeptQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public DeptQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/dept/model/vo/DeptVo.java
View file @ dde01f6e
...@@ -51,4 +51,12 @@ public class DeptVo extends BaseEntityLong { ...@@ -51,4 +51,12 @@ public class DeptVo extends BaseEntityLong {
/** 开始 关联事项数量 */ /** 开始 关联事项数量 */
private Integer totalStart; private Integer totalStart;
/**
* 大厅事项入驻(0.否,1.是)
*/
private Integer hallCheckIn;
/** 开始 入驻事项数量 */
private Integer inNumStart;
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
View file @ dde01f6e
...@@ -73,6 +73,11 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -73,6 +73,11 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
//过滤部门事项数据为0的部门 //过滤部门事项数据为0的部门
query.setTotalStart(1); query.setTotalStart(1);
} }
if (!ObjectUtils.isEmpty(query.getHallCheckIn()) && YesNoEnum.YES.getValue() == query.getHallCheckIn()) {
//过滤部门事项数据为0的部门
query.setInNumStart(1);
}
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
...@@ -176,10 +181,6 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -176,10 +181,6 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
*/ */
@Override @Override
protected void saveBefore(DeptEntity entity, Map<String, Object> model, Context context) throws AppException { protected void saveBefore(DeptEntity entity, Map<String, Object> model, Context context) throws AppException {
// DeptEntity deptEntity = this.service.selectOne(new DeptQuery().deptNumber(entity.getDeptNumber()));
// if(!ObjectUtils.isEmpty(deptEntity)){
// throw new AppException("部门编码已存在！");
// }
if (entity.newEntity()) { if (entity.newEntity()) {
entity.setSource(SourceEnum.自定义.getValue()); entity.setSource(SourceEnum.自定义.getValue());
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java
View file @ dde01f6e
...@@ -130,10 +130,10 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao, ...@@ -130,10 +130,10 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
for (MatterEntity matterEntity : matterList) { for (MatterEntity matterEntity : matterList) {
Rest<String> rest = matterService.buildMatterDetail(matterEntity, null); Rest<String> rest = matterService.buildMatterDetail(matterEntity, null);
if (rest.getCode() == YesNoEnum.YES.getValue()) { if (rest.getCode() == YesNoEnum.YES.getValue()) {
// log.info("更新详细事项==>{},id===>{},localVersion===>{}", matterEntity.getMatterName(),matterEntity.getId(),matterEntity.getMatterEdition()); // log.info("更新详细事项==>{},id===>{},localVersion===>{}", matterEntity.getMatterName(),matterEntity.getId(),matterEntity.getMatterEdition());
//matterEntity.setUrl(null); //matterEntity.setUrl(null);
matterEntity.setUpdateTime(new Date()); matterEntity.setUpdateTime(new Date());
matterService.update(matterEntity, null); matterService.update(matterEntity, null);
} }
} }
return Rest.ok(); return Rest.ok();
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ dde01f6e
...@@ -1063,7 +1063,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1063,7 +1063,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
if (matterEditionLocal >= matterEditionRemote) { if (matterEditionLocal >= matterEditionRemote) {
//bool = true; //bool = true;
msg = "本地事项版本大于等于远端，不需要更新！!"; msg = "本地事项版本大于等于远端，不需要更新！!";
break; // break;
// return Rest.fail("本地事项版本大于等于远端，不需要更新！"); // return Rest.fail("本地事项版本大于等于远端，不需要更新！");
} }
...@@ -1240,8 +1240,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1240,8 +1240,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
private void savebaseInfo(MatterEntity matterEntity, Map<String, String> baseInfoMap, Setting baseInfoSetting) { private void savebaseInfo(MatterEntity matterEntity, Map<String, String> baseInfoMap, Setting baseInfoSetting) {
//Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom); //Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
List<MatterExtEntity> matterExtEntities = new ArrayList<>();
long sortN = 1;
for (Map.Entry<String, String> m : baseInfoMap.entrySet()) { for (Map.Entry<String, String> m : baseInfoMap.entrySet()) {
String value = baseInfoSetting.getOrDefault(m.getKey(), ""); String value = baseInfoSetting.getOrDefault(m.getKey(), "");
if (!ObjectUtils.isEmpty(value)) { if (!ObjectUtils.isEmpty(value)) {
......
base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinBaseVo.java
View file @ dde01f6e
...@@ -28,4 +28,6 @@ public class SkinBaseVo extends BaseEntityLong { ...@@ -28,4 +28,6 @@ public class SkinBaseVo extends BaseEntityLong {
private String localZipPath; private String localZipPath;
private String prependPath;
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
View file @ dde01f6e
...@@ -229,7 +229,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -229,7 +229,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8)); InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8));
MultipartFile file = getMultipartFile(inputStream, "file.css"); MultipartFile file = getMultipartFile(inputStream, "file.css");
String filePath = uploadService.saveFileUpload(file, "/file/fileupload", context.getUser()); String filePath = uploadService.saveFileUpload(file, "/file/fileupload/skin", context.getUser());
entity.setCssFilePath(filePath); entity.setCssFilePath(filePath);
} catch (Exception e) { } catch (Exception e) {
...@@ -380,6 +380,12 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -380,6 +380,12 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
if (!ObjectUtils.isEmpty(skinBaseEntity.getPreviewImagePath())) { if (!ObjectUtils.isEmpty(skinBaseEntity.getPreviewImagePath())) {
skinBaseEntity.setPreviewImagePath(StrUtil.prependIfMissing(skinBaseEntity.getPreviewImagePath(), "/")); skinBaseEntity.setPreviewImagePath(StrUtil.prependIfMissing(skinBaseEntity.getPreviewImagePath(), "/"));
} }
if(!ObjectUtils.isEmpty(query.getPrependPath())){
}
} }
this.getDao().updateBatch(skinBaseEntities); this.getDao().updateBatch(skinBaseEntities);
......
base-manager/src/main/resources/sqlmap/module/dept/DeptMapper.xml
View file @ dde01f6e
...@@ -23,10 +23,11 @@ ...@@ -23,10 +23,11 @@
<result property="isEnglish" column="isEnglish" /> <result property="isEnglish" column="isEnglish" />
<result property="sort" column="sort" /> <result property="sort" column="sort" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="total" column="total" />
<result property="inNum" column="inNum" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="total" column="total" />
</resultMap> </resultMap>
...@@ -88,6 +89,12 @@ ...@@ -88,6 +89,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source, a.source,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
a.total,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('inNum') or colPickMode == 1 and data.containsKey('inNum')))">
a.inNum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -97,26 +104,23 @@ ...@@ -97,26 +104,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
a.total,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeptEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeptEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_dept insert into mortals_sys_dept
(tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,createTime,createUserId,updateTime,total) (tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,total,inNum,createTime,createUserId,updateTime)
VALUES VALUES
(#{tid},#{tname},#{name},#{simpleName},#{siteId},#{deptAbb},#{deptTelphone},#{deptNumber},#{isAutotable},#{isOrder},#{isBkb},#{isWorkGuide},#{usValid},#{isSecphone},#{isEnglish},#{sort},#{source},#{createTime},#{createUserId},#{updateTime},#{total}) (#{tid},#{tname},#{name},#{simpleName},#{siteId},#{deptAbb},#{deptTelphone},#{deptNumber},#{isAutotable},#{isOrder},#{isBkb},#{isWorkGuide},#{usValid},#{isSecphone},#{isEnglish},#{sort},#{source},#{total},#{inNum},#{createTime},#{createUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_dept insert into mortals_sys_dept
(tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,createTime,createUserId,updateTime,total) (tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,total,inNum,createTime,createUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.tid},#{item.tname},#{item.name},#{item.simpleName},#{item.siteId},#{item.deptAbb},#{item.deptTelphone},#{item.deptNumber},#{item.isAutotable},#{item.isOrder},#{item.isBkb},#{item.isWorkGuide},#{item.usValid},#{item.isSecphone},#{item.isEnglish},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.total}) (#{item.tid},#{item.tname},#{item.name},#{item.simpleName},#{item.siteId},#{item.deptAbb},#{item.deptTelphone},#{item.deptNumber},#{item.isAutotable},#{item.isOrder},#{item.isBkb},#{item.isWorkGuide},#{item.usValid},#{item.isSecphone},#{item.isEnglish},#{item.sort},#{item.source},#{item.total},#{item.inNum},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -207,6 +211,18 @@ ...@@ -207,6 +211,18 @@
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))"> <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement}, a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('total')) or (colPickMode==1 and !data.containsKey('total'))">
a.total=#{data.total},
</if>
<if test="(colPickMode==0 and data.containsKey('totalIncrement')) or (colPickMode==1 and !data.containsKey('totalIncrement'))">
a.total=ifnull(a.total,0) + #{data.totalIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('inNum')) or (colPickMode==1 and !data.containsKey('inNum'))">
a.inNum=#{data.inNum},
</if>
<if test="(colPickMode==0 and data.containsKey('inNumIncrement')) or (colPickMode==1 and !data.containsKey('inNumIncrement'))">
a.inNum=ifnull(a.inNum,0) + #{data.inNumIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -219,12 +235,6 @@ ...@@ -219,12 +235,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('total')) or (colPickMode==1 and !data.containsKey('total'))">
a.total=#{data.total},
</if>
<if test="(colPickMode==0 and data.containsKey('totalIncrement')) or (colPickMode==1 and !data.containsKey('totalIncrement'))">
a.total=ifnull(a.total,0) + #{data.totalIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -406,6 +416,30 @@ ...@@ -406,6 +416,30 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="total=(case" suffix="ELSE total end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
when a.id=#{item.id} then #{item.total}
</when>
<when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="inNum=(case" suffix="ELSE inNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('inNum')) or (colPickMode==1 and !item.containsKey('inNum'))">
when a.id=#{item.id} then #{item.inNum}
</when>
<when test="(colPickMode==0 and item.containsKey('inNumIncrement')) or (colPickMode==1 and !item.containsKey('inNumIncrement'))">
when a.id=#{item.id} then ifnull(a.inNum,0) + #{item.inNumIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -432,18 +466,6 @@ ...@@ -432,18 +466,6 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="total=(case" suffix="ELSE total end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
when a.id=#{item.id} then #{item.total}
</when>
<when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1004,6 +1026,60 @@ ...@@ -1004,6 +1026,60 @@
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd} ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if> </if>
<if test="conditionParamRef.containsKey('total')">
<if test="conditionParamRef.total != null ">
${_conditionType_} a.total = #{${_conditionParam_}.total}
</if>
<if test="conditionParamRef.total == null">
${_conditionType_} a.total is null
</if>
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
${_conditionType_} a.total in
<foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
${_conditionType_} a.total not in
<foreach collection="conditionParamRef.totalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
</if>
<if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
</if>
<if test="conditionParamRef.containsKey('inNum')">
<if test="conditionParamRef.inNum != null ">
${_conditionType_} a.inNum = #{${_conditionParam_}.inNum}
</if>
<if test="conditionParamRef.inNum == null">
${_conditionType_} a.inNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('inNumList') and conditionParamRef.inNumList.size() > 0">
${_conditionType_} a.inNum in
<foreach collection="conditionParamRef.inNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('inNumNotList') and conditionParamRef.inNumNotList.size() > 0">
${_conditionType_} a.inNum not in
<foreach collection="conditionParamRef.inNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('inNumStart') and conditionParamRef.inNumStart != null">
${_conditionType_} a.inNum <![CDATA[ >= ]]> #{${_conditionParam_}.inNumStart}
</if>
<if test="conditionParamRef.containsKey('inNumEnd') and conditionParamRef.inNumEnd != null">
${_conditionType_} a.inNum <![CDATA[ <= ]]> #{${_conditionParam_}.inNumEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -1061,38 +1137,10 @@ ...@@ -1061,38 +1137,10 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('total')">
<if test="conditionParamRef.total != null ">
${_conditionType_} a.total = #{${_conditionParam_}.total}
</if>
<if test="conditionParamRef.total == null">
${_conditionType_} a.total is null
</if>
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
${_conditionType_} a.total in
<foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
${_conditionType_} a.total not in
<foreach collection="conditionParamRef.totalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
</if>
<if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id, field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
...@@ -1100,14 +1148,103 @@ ...@@ -1100,14 +1148,103 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isAutotableList') and conditionParamRef.isAutotableList.size() > 0">
field(a.isAutotable,
<foreach collection="conditionParamRef.isAutotableList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isOrderList') and conditionParamRef.isOrderList.size() > 0">
field(a.isOrder,
<foreach collection="conditionParamRef.isOrderList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isBkbList') and conditionParamRef.isBkbList.size() > 0">
field(a.isBkb,
<foreach collection="conditionParamRef.isBkbList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isWorkGuideList') and conditionParamRef.isWorkGuideList.size() > 0">
field(a.isWorkGuide,
<foreach collection="conditionParamRef.isWorkGuideList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('usValidList') and conditionParamRef.usValidList.size() > 0">
field(a.usValid,
<foreach collection="conditionParamRef.usValidList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isSecphoneList') and conditionParamRef.isSecphoneList.size() > 0">
field(a.isSecphone,
<foreach collection="conditionParamRef.isSecphoneList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isEnglishList') and conditionParamRef.isEnglishList.size() > 0">
field(a.isEnglish,
<foreach collection="conditionParamRef.isEnglishList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
field(a.sort,
<foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
field(a.total,
<foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('inNumList') and conditionParamRef.inNumList.size() > 0">
field(a.inNum,
<foreach collection="conditionParamRef.inNumList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
...@@ -1117,6 +1254,97 @@ ...@@ -1117,6 +1254,97 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isAutotableList') and conditionParamRef.isAutotableList.size() > 0">
field(a.isAutotable,
<foreach collection="conditionParamRef.isAutotableList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isOrderList') and conditionParamRef.isOrderList.size() > 0">
field(a.isOrder,
<foreach collection="conditionParamRef.isOrderList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isBkbList') and conditionParamRef.isBkbList.size() > 0">
field(a.isBkb,
<foreach collection="conditionParamRef.isBkbList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isWorkGuideList') and conditionParamRef.isWorkGuideList.size() > 0">
field(a.isWorkGuide,
<foreach collection="conditionParamRef.isWorkGuideList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('usValidList') and conditionParamRef.usValidList.size() > 0">
field(a.usValid,
<foreach collection="conditionParamRef.usValidList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isSecphoneList') and conditionParamRef.isSecphoneList.size() > 0">
field(a.isSecphone,
<foreach collection="conditionParamRef.isSecphoneList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('isEnglishList') and conditionParamRef.isEnglishList.size() > 0">
field(a.isEnglish,
<foreach collection="conditionParamRef.isEnglishList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
field(a.sort,
<foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
field(a.total,
<foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('inNumList') and conditionParamRef.inNumList.size() > 0">
field(a.inNum,
<foreach collection="conditionParamRef.inNumList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1208,6 +1436,16 @@ ...@@ -1208,6 +1436,16 @@
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if> <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('total')">
a.total
<if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('inNum')">
a.inNum
<if test='orderCol.inNum != null and "DESC".equalsIgnoreCase(orderCol.inNum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
...@@ -1223,11 +1461,6 @@ ...@@ -1223,11 +1461,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('total')">
a.total
<if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ dde01f6e
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"baseUrl": "https://192.168.0.98:31071/base" "baseUrl": "https://192.168.0.98:31071/base"
}, },
"base-test1": { "base-test-remote": {
"baseUrl": "http://8.136.255.30:11071/base" "baseUrl": "http://8.136.255.30:11071/base"
}, },
......
base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http
View file @ dde01f6e
...@@ -16,16 +16,17 @@ Content-Type: application/json ...@@ -16,16 +16,17 @@ Content-Type: application/json
###基础事项列表 ###基础事项列表
POST {{baseUrl}}/matter/list POST {{baseUrl}}/site/matter/list
Content-Type: application/json Content-Type: application/json
{ {
"siteId": 1 "siteId": 1,
"hallCheckIn":1
} }
###基础事项列表 ###基础事项列表
POST {{baseUrl}}/matter/list POST {{baseUrl}}/site/matter/list
Content-Type: application/json Content-Type: application/json
{ {
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ dde01f6e
...@@ -192,16 +192,6 @@ Content-Type: application/json ...@@ -192,16 +192,6 @@ Content-Type: application/json
"body":"{\"accountId\":\"1018145\"}" "body":"{\"accountId\":\"1018145\"}"
} }
###短信设置编辑
GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
Accept: application/json
###短信设置删除
GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
Accept: application/json
###同步数据 ###同步数据
GET {{baseUrl}}/test/syncMatter GET {{baseUrl}}/test/syncMatter
Accept: application/json Accept: application/json
...@@ -255,4 +245,11 @@ Content-Type: application/json ...@@ -255,4 +245,11 @@ Content-Type: application/json
"content": "9LXYEcq8GbYv0USImvQzNsAyhv5739qBNC7qCES1qCGDgdx24J+Ut4aVsKzkW0sRiqI9hg/NJAQEiTEz05QldexZUFmLPiZ1ODPf4wMA2WU=", "content": "9LXYEcq8GbYv0USImvQzNsAyhv5739qBNC7qCES1qCGDgdx24J+Ut4aVsKzkW0sRiqI9hg/NJAQEiTEz05QldexZUFmLPiZ1ODPf4wMA2WU=",
"key": "i70x15Dy19C020Ry", "key": "i70x15Dy19C020Ry",
"password": "i70x15Dy19C020Ry" "password": "i70x15Dy19C020Ry"
} }
\ No newline at end of file
###limit
POST {{baseUrl}}/test/limit
Content-Type: application/json
{}
\ No newline at end of file
base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http
View file @ dde01f6e
...@@ -3,7 +3,7 @@ POST {{baseUrl}}/workman/doLogin ...@@ -3,7 +3,7 @@ POST {{baseUrl}}/workman/doLogin
Content-Type: application/json Content-Type: application/json
{ {
"loginName":"zengxia", "loginName":"yangying",
"loginPwd":"123", "loginPwd":"123",
"siteId": 1 "siteId": 1
} }
......
portal-manager/src/main/java/com/mortals/xhx/base/login/web/SecurityCodeController.java
View file @ dde01f6e
...@@ -6,6 +6,7 @@ import com.mortals.xhx.base.login.service.GifSecurityImage; ...@@ -6,6 +6,7 @@ import com.mortals.xhx.base.login.service.GifSecurityImage;
import com.mortals.xhx.base.system.valid.model.ValidCodeEntity; import com.mortals.xhx.base.system.valid.model.ValidCodeEntity;
import com.mortals.xhx.base.system.valid.service.ValidCodeService; import com.mortals.xhx.base.system.valid.service.ValidCodeService;
import com.mortals.xhx.base.system.valid.web.ValidCodeForm; import com.mortals.xhx.base.system.valid.web.ValidCodeForm;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -18,48 +19,48 @@ import java.awt.image.BufferedImage; ...@@ -18,48 +19,48 @@ import java.awt.image.BufferedImage;
@RestController @RestController
@RequestMapping("securitycode") @RequestMapping("securitycode")
public class SecurityCodeController public class SecurityCodeController
extends BaseCRUDJsonController<ValidCodeService, ValidCodeForm, ValidCodeEntity, Long> { extends BaseCRUDJsonController<ValidCodeService, ValidCodeForm, ValidCodeEntity, Long> {
@Autowired @Autowired
private ValidCodeService validCodeService; private ValidCodeService validCodeService;
@RequestMapping("createCode") @RequestMapping("createCode")
public void createCode(HttpServletRequest request, HttpServletResponse response) { public void createCode(HttpServletRequest request, HttpServletResponse response) {
// 获取默认难度和长度的验证码 // 获取默认难度和长度的验证码
String securityCode = validCodeService.createImageValidCode(request.getParameter("mark"),super.getRequestIP(request)); String securityCode = validCodeService.createImageValidCode(request.getParameter("mark"), super.getRequestIP(request));
// int imageType = ParamUtil.getInt("securityImage", 1); // int imageType = ParamUtil.getInt("securityImage", 1);
int imageType = 0; int imageType = 0;
switch (imageType) { switch (imageType) {
case 1: case 1:
BufferedImage image = SecurityImage.createImage(securityCode); BufferedImage image = SecurityImage.createImage(securityCode);
super.doResponseImage(response, image); super.doResponseImage(response, image);
break; break;
default: default:
// 默认图验 // 默认图验
byte[] content = GifSecurityImage.createGifImage(securityCode); byte[] content = GifSecurityImage.createGifImage(securityCode);
doResponseGif(response, content); doResponseGif(response, content);
break; break;
} }
// // 获取默认难度和长度的验证码 // // 获取默认难度和长度的验证码
// String securityCode = // String securityCode =
// validCodeService.createImageValidCode(request.getSession().getId(), // validCodeService.createImageValidCode(request.getSession().getId(),
// super.getRequestIP(request)); // super.getRequestIP(request));
// BufferedImage image = SecurityImage.createImage(securityCode); // BufferedImage image = SecurityImage.createImage(securityCode);
// super.doResponseImage(response, image); // super.doResponseImage(response, image);
} }
protected void doResponseGif(HttpServletResponse response, byte[] content) { protected void doResponseGif(HttpServletResponse response, byte[] content) {
try { try {
response.setHeader("Pragma", "No-cache"); response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "No-cache"); response.setHeader("Cache-Control", "No-cache");
response.setDateHeader("Expires", 0); response.setDateHeader("Expires", 0);
response.setContentType("image/gif"); response.setContentType("image/gif");
IOUtils.write(content, response.getOutputStream()); IOUtils.write(content, response.getOutputStream());
} catch (Exception e) { } catch (Exception e) {
log.error("验证码图片传输异常-->" + e.getMessage()); log.error("验证码图片传输异常-->" + e.getMessage());
} }
} }
} }
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