Skip to content

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

修改同步抓取脚本

parent 80469f94
Show whitespace changes
Inline Side-by-side
Showing with 1980 additions and 1243 deletions
base-manager/src/main/java/com/mortals/xhx/ManagerBaseApplication.java
View file @ 04a3bf20
package com.mortals.xhx;
import com.mortals.framework.springcloud.boot.BaseWebApplication;
import com.mortals.framework.util.HttpUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
......
base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
View file @ 04a3bf20
package com.mortals.xhx.busiz.web;
import cn.hutool.core.codec.Base64;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
......@@ -11,6 +13,14 @@ 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 lombok.extern.apachecommons.CommonsLog;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.client.CookieStore;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -18,8 +28,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
......@@ -31,13 +43,10 @@ import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
* @date: 2022/12/14 9:18
*/
@RestController
@CommonsLog
@RequestMapping("test")
@Slf4j
public class DemoWebApiController {
@Autowired
private MatterService matterService;
@PostMapping(value = "testGov")
@UnAuth
public Rest<String> testGov(@RequestBody MatterQuery query) {
......@@ -45,5 +54,61 @@ public class DemoWebApiController {
return Rest.ok(resp);
}
@PostMapping(value = "testCookie")
@UnAuth
public Rest<String> testCookie(@RequestBody MatterQuery query) {
log.info("测试cookie");
HttpClient http = null;
CookieStore httpCookieStore = new BasicCookieStore();
http = HttpClientBuilder.create().setDefaultCookieStore(httpCookieStore).build();
/* do stuff */
HttpGet httpRequest = new HttpGet(query.getUrl());
HttpResponse httpResponse = null;
try {
httpResponse = http.execute(httpRequest);
byte[] data = EntityUtils.toByteArray(httpResponse.getEntity());
String encode = Base64.encode(data);
//String content = EntityUtils.toString(entity, charset);
//httpResponse.getEntity()
//httpResponse.toString()
} catch (Exception e) {
log.error("异常", e);
}
/* check cookies */
String cookieStr = Arrays.asList(httpCookieStore.getCookies()).stream().map(item -> JSON.toJSONString(item)).collect(Collectors.joining("|"));
log.info("cookies:{}", cookieStr);
return Rest.ok(cookieStr);
}
public static void main(String[] args) {
HttpClient http = null;
CookieStore httpCookieStore = new BasicCookieStore();
http = HttpClientBuilder.create().setDefaultCookieStore(httpCookieStore).build();
/* do stuff */
HttpGet httpRequest = new HttpGet("http://zxbl.sczwfw.gov.cn/app/account/imageCode");
HttpResponse httpResponse = null;
try {
httpResponse = http.execute(httpRequest);
byte[] data = EntityUtils.toByteArray(httpResponse.getEntity());
String encode = Base64.encode(data);
log.info("encode64:{}",encode);
// String resp = com.mortals.framework.util.HttpUtil.processMultipartResponse(httpResponse);
// log.info("resp:{}", resp);
//String content = EntityUtils.toString(entity, charset);
//httpResponse.getEntity()
//httpResponse.toString()
} catch (Exception e) {
log.error("异常", e);
}
/* check cookies */
String cookieStr = Arrays.asList(httpCookieStore.getCookies()).stream().map(item -> JSON.toJSONString(item)).collect(Collectors.joining("|"));
// log.info("cookies:{}", cookieStr);
}
}
base-manager/src/main/java/com/mortals/xhx/busiz/web/MicroWebApiController.java
View file @ 04a3bf20
package com.mortals.xhx.busiz.web;
import cn.hutool.core.codec.Base64;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.util.HttpUtil;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery;
......@@ -12,6 +15,14 @@ import com.mortals.xhx.module.matter.model.vo.MatterInfo;
import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.matters.service.MattersService;
import lombok.extern.apachecommons.CommonsLog;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.client.CookieStore;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -20,8 +31,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
......@@ -33,7 +46,7 @@ import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
* @date: 2022/12/14 9:18
*/
@RestController
@CommonsLog
@Slf4j
@RequestMapping("micro")
public class MicroWebApiController extends BaseJsonBodyController {
......@@ -65,7 +78,27 @@ public class MicroWebApiController extends BaseJsonBodyController {
return ret;
}
@PostMapping(value = "getPicAndCookie")
@UnAuth
public Rest<Map<String,String>> getPicAndCookie(@RequestBody MatterQuery query) {
log.info("请求查询图片与cookies:{}",JSON.toJSONString(query));
HashMap<String, String> resultMap = new HashMap<>();
CookieStore httpCookieStore = new BasicCookieStore();
HttpClient http = HttpClientBuilder.create().setDefaultCookieStore(httpCookieStore).build();
HttpGet httpRequest = new HttpGet(query.getUrl());
HttpResponse httpResponse = null;
try {
httpResponse = http.execute(httpRequest);
byte[] data = EntityUtils.toByteArray(httpResponse.getEntity());
String encode = Base64.encode(data);
resultMap.put("base64img","data:image/jpg;base64,"+encode);
resultMap.put("cookieStr",JSON.toJSONString(httpCookieStore.getCookies()));
} catch (Exception e) {
log.error("异常", e);
}
return Rest.ok(resultMap);
}
protected PageInfo buildPageInfo(MatterQuery query) {
PageInfo pageInfo = new PageInfo();
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
View file @ 04a3bf20
package com.mortals.xhx.module.matter.model;
import java.util.List;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.MatterVo;
import com.mortals.xhx.module.matter.model.MatterExtEntity;
/**
* 基础事项实体对象
*
......@@ -322,1067 +325,1369 @@ public class MatterEntity extends MatterVo {
/**
* 事项扩展信息
*/
private List<MatterExtEntity> matterExtList=new ArrayList<>();;
private List<MatterExtEntity> matterExtList = new ArrayList<>();
;
public MatterEntity(){}
public MatterEntity() {
}
/**
* 获取 站点ID
*
* @return Long
*/
public Long getSiteId(){
public Long getSiteId() {
return siteId;
}
/**
* 设置 站点ID
*
* @param siteId
*/
public void setSiteId(Long siteId){
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
/**
* 获取 从政务系统来的事项id
*
* @return String
*/
public String getTid(){
public String getTid() {
return tid;
}
/**
* 设置 从政务系统来的事项id
*
* @param tid
*/
public void setTid(String tid){
public void setTid(String tid) {
this.tid = tid;
}
/**
* 获取 从政务系统来的事项code
*
* @return String
*/
public String getTcode(){
public String getTcode() {
return tcode;
}
/**
* 设置 从政务系统来的事项code
*
* @param tcode
*/
public void setTcode(String tcode){
public void setTcode(String tcode) {
this.tcode = tcode;
}
/**
* 获取 从政务系统来的事项name
*
* @return String
*/
public String getTname(){
public String getTname() {
return tname;
}
/**
* 设置 从政务系统来的事项name
*
* @param tname
*/
public void setTname(String tname){
public void setTname(String tname) {
this.tname = tname;
}
/**
* 获取 事项名称
*
* @return String
*/
public String getMatterName(){
public String getMatterName() {
return matterName;
}
/**
* 设置 事项名称
*
* @param matterName
*/
public void setMatterName(String matterName){
public void setMatterName(String matterName) {
this.matterName = matterName;
}
/**
* 获取 英语事项名
*
* @return String
*/
public String getEnglishName(){
public String getEnglishName() {
return englishName;
}
/**
* 设置 英语事项名
*
* @param englishName
*/
public void setEnglishName(String englishName){
public void setEnglishName(String englishName) {
this.englishName = englishName;
}
/**
* 获取 事项编号
*
* @return String
*/
public String getMatterNo(){
public String getMatterNo() {
return matterNo;
}
/**
* 设置 事项编号
*
* @param matterNo
*/
public void setMatterNo(String matterNo){
public void setMatterNo(String matterNo) {
this.matterNo = matterNo;
}
/**
* 获取 区域编码
*
* @return String
*/
public String getAreaCode(){
public String getAreaCode() {
return areaCode;
}
/**
* 设置 区域编码
*
* @param areaCode
*/
public void setAreaCode(String areaCode){
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
/**
* 获取 部门编号
*
* @return String
*/
public String getDeptCode(){
public String getDeptCode() {
return deptCode;
}
/**
* 设置 部门编号
*
* @param deptCode
*/
public void setDeptCode(String deptCode){
public void setDeptCode(String deptCode) {
this.deptCode = deptCode;
}
/**
* 获取 部门名称
*
* @return String
*/
public String getDeptName(){
public String getDeptName() {
return deptName;
}
/**
* 设置 部门名称
*
* @param deptName
*/
public void setDeptName(String deptName){
public void setDeptName(String deptName) {
this.deptName = deptName;
}
/**
* 获取 行政权力编号
*
* @return String
*/
public String getPowerCode(){
public String getPowerCode() {
return powerCode;
}
/**
* 设置 行政权力编号
*
* @param powerCode
*/
public void setPowerCode(String powerCode){
public void setPowerCode(String powerCode) {
this.powerCode = powerCode;
}
/**
* 获取 主题编号
*
* @return String
*/
public String getThemeCode(){
public String getThemeCode() {
return themeCode;
}
/**
* 设置 主题编号
*
* @param themeCode
*/
public void setThemeCode(String themeCode){
public void setThemeCode(String themeCode) {
this.themeCode = themeCode;
}
/**
* 获取 服务类型编号
*
* @return String
*/
public String getUsertypeCode(){
public String getUsertypeCode() {
return usertypeCode;
}
/**
* 设置 服务类型编号
*
* @param usertypeCode
*/
public void setUsertypeCode(String usertypeCode){
public void setUsertypeCode(String usertypeCode) {
this.usertypeCode = usertypeCode;
}
/**
* 获取 事项组名
*
* @return String
*/
public String getGroupName(){
public String getGroupName() {
return groupName;
}
/**
* 设置 事项组名
*
* @param groupName
*/
public void setGroupName(String groupName){
public void setGroupName(String groupName) {
this.groupName = groupName;
}
/**
* 获取 事项详情链接
*
* @return String
*/
public String getUrl(){
public String getUrl() {
return url;
}
/**
* 设置 事项详情链接
*
* @param url
*/
public void setUrl(String url){
public void setUrl(String url) {
this.url = url;
}
/**
* 获取 是否获取事项详情
*
* @return String
*/
public String getHaveGetMatterInfo(){
public String getHaveGetMatterInfo() {
return haveGetMatterInfo;
}
/**
* 设置 是否获取事项详情
*
* @param haveGetMatterInfo
*/
public void setHaveGetMatterInfo(String haveGetMatterInfo){
public void setHaveGetMatterInfo(String haveGetMatterInfo) {
this.haveGetMatterInfo = haveGetMatterInfo;
}
/**
* 获取 所属部门
*
* @return String
*/
public String getBelongDept(){
public String getBelongDept() {
return belongDept;
}
/**
* 设置 所属部门
*
* @param belongDept
*/
public void setBelongDept(String belongDept){
public void setBelongDept(String belongDept) {
this.belongDept = belongDept;
}
/**
* 获取 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
*
* @return String
*/
public String getAppoveObjectShow(){
public String getAppoveObjectShow() {
return appoveObjectShow;
}
/**
* 设置 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
*
* @param appoveObjectShow
*/
public void setAppoveObjectShow(String appoveObjectShow){
public void setAppoveObjectShow(String appoveObjectShow) {
this.appoveObjectShow = appoveObjectShow;
}
/**
* 获取 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
*
* @return String
*/
public String getOperatScopeShow(){
public String getOperatScopeShow() {
return operatScopeShow;
}
/**
* 设置 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
*
* @param operatScopeShow
*/
public void setOperatScopeShow(String operatScopeShow){
public void setOperatScopeShow(String operatScopeShow) {
this.operatScopeShow = operatScopeShow;
}
/**
* 获取 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
*
* @return String
*/
public String getAppoveTimeLimitShow(){
public String getAppoveTimeLimitShow() {
return appoveTimeLimitShow;
}
/**
* 设置 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
*
* @param appoveTimeLimitShow
*/
public void setAppoveTimeLimitShow(String appoveTimeLimitShow){
public void setAppoveTimeLimitShow(String appoveTimeLimitShow) {
this.appoveTimeLimitShow = appoveTimeLimitShow;
}
/**
* 获取 办理形式（窗口办理.窗口办理，网上办理.网上办理）
*
* @return String
*/
public String getHandleType(){
public String getHandleType() {
return handleType;
}
/**
* 设置 办理形式（窗口办理.窗口办理，网上办理.网上办理）
*
* @param handleType
*/
public void setHandleType(String handleType){
public void setHandleType(String handleType) {
this.handleType = handleType;
}
/**
* 获取 法定办结时限
*
* @return String
*/
public String getLegalTimeLimitShow(){
public String getLegalTimeLimitShow() {
return legalTimeLimitShow;
}
/**
* 设置 法定办结时限
*
* @param legalTimeLimitShow
*/
public void setLegalTimeLimitShow(String legalTimeLimitShow){
public void setLegalTimeLimitShow(String legalTimeLimitShow) {
this.legalTimeLimitShow = legalTimeLimitShow;
}
/**
* 获取 法定时限办结说明
*
* @return String
*/
public String getLegalEndExplain(){
public String getLegalEndExplain() {
return legalEndExplain;
}
/**
* 设置 法定时限办结说明
*
* @param legalEndExplain
*/
public void setLegalEndExplain(String legalEndExplain){
public void setLegalEndExplain(String legalEndExplain) {
this.legalEndExplain = legalEndExplain;
}
/**
* 获取 承诺办结时限
*
* @return String
*/
public String getPromiseTimeLimitShow(){
public String getPromiseTimeLimitShow() {
return promiseTimeLimitShow;
}
/**
* 设置 承诺办结时限
*
* @param promiseTimeLimitShow
*/
public void setPromiseTimeLimitShow(String promiseTimeLimitShow){
public void setPromiseTimeLimitShow(String promiseTimeLimitShow) {
this.promiseTimeLimitShow = promiseTimeLimitShow;
}
/**
* 获取 承诺时限办结说明
*
* @return String
*/
public String getPromiseEndExplain(){
public String getPromiseEndExplain() {
return promiseEndExplain;
}
/**
* 设置 承诺时限办结说明
*
* @param promiseEndExplain
*/
public void setPromiseEndExplain(String promiseEndExplain){
public void setPromiseEndExplain(String promiseEndExplain) {
this.promiseEndExplain = promiseEndExplain;
}
/**
* 获取 是否收费（否.否，是.是）
*
* @return String
*/
public String getIsChargesShow(){
public String getIsChargesShow() {
return isChargesShow;
}
/**
* 设置 是否收费（否.否，是.是）
*
* @param isChargesShow
*/
public void setIsChargesShow(String isChargesShow){
public void setIsChargesShow(String isChargesShow) {
this.isChargesShow = isChargesShow;
}
/**
* 获取 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）
*
* @return String
*/
public String getCertificationLevelsShow(){
public String getCertificationLevelsShow() {
return certificationLevelsShow;
}
/**
* 设置 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签）
*
* @param certificationLevelsShow
*/
public void setCertificationLevelsShow(String certificationLevelsShow){
public void setCertificationLevelsShow(String certificationLevelsShow) {
this.certificationLevelsShow = certificationLevelsShow;
}
/**
* 获取 计划生效日期
*
* @return Date
*/
public Date getPlanTakeTime(){
public Date getPlanTakeTime() {
return planTakeTime;
}
/**
* 设置 计划生效日期
*
* @param planTakeTime
*/
public void setPlanTakeTime(Date planTakeTime){
public void setPlanTakeTime(Date planTakeTime) {
this.planTakeTime = planTakeTime;
}
/**
* 获取 承诺生效日期
*
* @return Date
*/
public Date getPromiseTakeTime(){
public Date getPromiseTakeTime() {
return promiseTakeTime;
}
/**
* 设置 承诺生效日期
*
* @param promiseTakeTime
*/
public void setPromiseTakeTime(Date promiseTakeTime){
public void setPromiseTakeTime(Date promiseTakeTime) {
this.promiseTakeTime = promiseTakeTime;
}
/**
* 获取 特别程序
*
* @return String
*/
public String getSpecialProcedure(){
public String getSpecialProcedure() {
return specialProcedure;
}
/**
* 设置 特别程序
*
* @param specialProcedure
*/
public void setSpecialProcedure(String specialProcedure){
public void setSpecialProcedure(String specialProcedure) {
this.specialProcedure = specialProcedure;
}
/**
* 获取 窗口到现场次数
*
* @return Integer
*/
public Integer getWindowToTheSceneNum(){
public Integer getWindowToTheSceneNum() {
return windowToTheSceneNum;
}
/**
* 设置 窗口到现场次数
*
* @param windowToTheSceneNum
*/
public void setWindowToTheSceneNum(Integer windowToTheSceneNum){
public void setWindowToTheSceneNum(Integer windowToTheSceneNum) {
this.windowToTheSceneNum = windowToTheSceneNum;
}
/**
* 获取 是否网上预约,窗口办理选（否.否，是.是）
*
* @return String
*/
public String getIsOnlineSubscribeShow(){
public String getIsOnlineSubscribeShow() {
return isOnlineSubscribeShow;
}
/**
* 设置 是否网上预约,窗口办理选（否.否，是.是）
*
* @param isOnlineSubscribeShow
*/
public void setIsOnlineSubscribeShow(String isOnlineSubscribeShow){
public void setIsOnlineSubscribeShow(String isOnlineSubscribeShow) {
this.isOnlineSubscribeShow = isOnlineSubscribeShow;
}
/**
* 获取 物流快递,窗口办理选（否.否，是.是）
*
* @return String
*/
public String getIsExpressTakeShow(){
public String getIsExpressTakeShow() {
return isExpressTakeShow;
}
/**
* 设置 物流快递,窗口办理选（否.否，是.是）
*
* @param isExpressTakeShow
*/
public void setIsExpressTakeShow(String isExpressTakeShow){
public void setIsExpressTakeShow(String isExpressTakeShow) {
this.isExpressTakeShow = isExpressTakeShow;
}
/**
* 获取 是否支持全省范围就近取件（否.否，是.是）
*
* @return String
*/
public String getIsProvinceAcquisitionShow(){
public String getIsProvinceAcquisitionShow() {
return isProvinceAcquisitionShow;
}
/**
* 设置 是否支持全省范围就近取件（否.否，是.是）
*
* @param isProvinceAcquisitionShow
*/
public void setIsProvinceAcquisitionShow(String isProvinceAcquisitionShow){
public void setIsProvinceAcquisitionShow(String isProvinceAcquisitionShow) {
this.isProvinceAcquisitionShow = isProvinceAcquisitionShow;
}
/**
* 获取 是否支持全省范围就近办理（否.否，是.是）
*
* @return String
*/
public String getIsApplyProvinceShow(){
public String getIsApplyProvinceShow() {
return isApplyProvinceShow;
}
/**
* 设置 是否支持全省范围就近办理（否.否，是.是）
*
* @param isApplyProvinceShow
*/
public void setIsApplyProvinceShow(String isApplyProvinceShow){
public void setIsApplyProvinceShow(String isApplyProvinceShow) {
this.isApplyProvinceShow = isApplyProvinceShow;
}
/**
* 获取 必须到现场原因
*
* @return String
*/
public String getMustSceneExplain(){
public String getMustSceneExplain() {
return mustSceneExplain;
}
/**
* 设置 必须到现场原因
*
* @param mustSceneExplain
*/
public void setMustSceneExplain(String mustSceneExplain){
public void setMustSceneExplain(String mustSceneExplain) {
this.mustSceneExplain = mustSceneExplain;
}
/**
* 获取 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
*
* @return String
*/
public String getOnlineType(){
public String getOnlineType() {
return onlineType;
}
/**
* 设置 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
*
* @param onlineType
*/
public void setOnlineType(String onlineType){
public void setOnlineType(String onlineType) {
this.onlineType = onlineType;
}
/**
* 获取 网办到现场次数
*
* @return Integer
*/
public Integer getOnlineToTheSceneNum(){
public Integer getOnlineToTheSceneNum() {
return onlineToTheSceneNum;
}
/**
* 设置 网办到现场次数
*
* @param onlineToTheSceneNum
*/
public void setOnlineToTheSceneNum(Integer onlineToTheSceneNum){
public void setOnlineToTheSceneNum(Integer onlineToTheSceneNum) {
this.onlineToTheSceneNum = onlineToTheSceneNum;
}
/**
* 获取 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
*
* @return String
*/
public String getOnlineOperatDeep(){
public String getOnlineOperatDeep() {
return onlineOperatDeep;
}
/**
* 设置 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
*
* @param onlineOperatDeep
*/
public void setOnlineOperatDeep(String onlineOperatDeep){
public void setOnlineOperatDeep(String onlineOperatDeep) {
this.onlineOperatDeep = onlineOperatDeep;
}
/**
* 获取 物流快递，网上办理选（否.否，是.是）
*
* @return String
*/
public String getIsExpressTakeOnlineShow(){
public String getIsExpressTakeOnlineShow() {
return isExpressTakeOnlineShow;
}
/**
* 设置 物流快递，网上办理选（否.否，是.是）
*
* @param isExpressTakeOnlineShow
*/
public void setIsExpressTakeOnlineShow(String isExpressTakeOnlineShow){
public void setIsExpressTakeOnlineShow(String isExpressTakeOnlineShow) {
this.isExpressTakeOnlineShow = isExpressTakeOnlineShow;
}
/**
* 获取 是否支持上门收取申请（否.否，是.是）
*
* @return String
*/
public String getIsDoorTakeShow(){
public String getIsDoorTakeShow() {
return isDoorTakeShow;
}
/**
* 设置 是否支持上门收取申请（否.否，是.是）
*
* @param isDoorTakeShow
*/
public void setIsDoorTakeShow(String isDoorTakeShow){
public void setIsDoorTakeShow(String isDoorTakeShow) {
this.isDoorTakeShow = isDoorTakeShow;
}
/**
* 获取 网上必须到现场原因
*
* @return String
*/
public String getOnlineMustSceneExplain(){
public String getOnlineMustSceneExplain() {
return onlineMustSceneExplain;
}
/**
* 设置 网上必须到现场原因
*
* @param onlineMustSceneExplain
*/
public void setOnlineMustSceneExplain(String onlineMustSceneExplain){
public void setOnlineMustSceneExplain(String onlineMustSceneExplain) {
this.onlineMustSceneExplain = onlineMustSceneExplain;
}
/**
* 获取 实施主体
*
* @return String
*/
public String getPerformDeptType(){
public String getPerformDeptType() {
return performDeptType;
}
/**
* 设置 实施主体
*
* @param performDeptType
*/
public void setPerformDeptType(String performDeptType){
public void setPerformDeptType(String performDeptType) {
this.performDeptType = performDeptType;
}
/**
* 获取 事项版本
*
* @return String
*/
public String getMatterEdition(){
public String getMatterEdition() {
return matterEdition;
}
/**
* 设置 事项版本
*
* @param matterEdition
*/
public void setMatterEdition(String matterEdition){
public void setMatterEdition(String matterEdition) {
this.matterEdition = matterEdition;
}
/**
* 获取 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
*
* @return String
*/
public String getEventTypeShow(){
public String getEventTypeShow() {
return eventTypeShow;
}
/**
* 设置 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
*
* @param eventTypeShow
*/
public void setEventTypeShow(String eventTypeShow){
public void setEventTypeShow(String eventTypeShow) {
this.eventTypeShow = eventTypeShow;
}
/**
* 获取 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
*
* @return String
*/
public String getPerformHierarchyShow(){
public String getPerformHierarchyShow() {
return performHierarchyShow;
}
/**
* 设置 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
*
* @param performHierarchyShow
*/
public void setPerformHierarchyShow(String performHierarchyShow){
public void setPerformHierarchyShow(String performHierarchyShow) {
this.performHierarchyShow = performHierarchyShow;
}
/**
* 获取 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
*
* @return String
*/
public String getPowerSourceShow(){
public String getPowerSourceShow() {
return powerSourceShow;
}
/**
* 设置 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
*
* @param powerSourceShow
*/
public void setPowerSourceShow(String powerSourceShow){
public void setPowerSourceShow(String powerSourceShow) {
this.powerSourceShow = powerSourceShow;
}
/**
* 获取 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
*
* @return String
*/
public String getPerformDeptTypeShow(){
public String getPerformDeptTypeShow() {
return performDeptTypeShow;
}
/**
* 设置 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
*
* @param performDeptTypeShow
*/
public void setPerformDeptTypeShow(String performDeptTypeShow){
public void setPerformDeptTypeShow(String performDeptTypeShow) {
this.performDeptTypeShow = performDeptTypeShow;
}
/**
* 获取 是否进驻中心（否.否，是.是）
*
* @return String
*/
public String getGoveServiceCenterShow(){
public String getGoveServiceCenterShow() {
return goveServiceCenterShow;
}
/**
* 设置 是否进驻中心（否.否，是.是）
*
* @param goveServiceCenterShow
*/
public void setGoveServiceCenterShow(String goveServiceCenterShow){
public void setGoveServiceCenterShow(String goveServiceCenterShow) {
this.goveServiceCenterShow = goveServiceCenterShow;
}
/**
* 获取 是否纳入便民服务中心（否.否，是.是）
*
* @return String
*/
public String getIsConvenientCenterShow(){
public String getIsConvenientCenterShow() {
return isConvenientCenterShow;
}
/**
* 设置 是否纳入便民服务中心（否.否，是.是）
*
* @param isConvenientCenterShow
*/
public void setIsConvenientCenterShow(String isConvenientCenterShow){
public void setIsConvenientCenterShow(String isConvenientCenterShow) {
this.isConvenientCenterShow = isConvenientCenterShow;
}
/**
* 获取 自助终端办理 （否.否，是.是）
*
* @return String
*/
public String getTerminalHandle(){
public String getTerminalHandle() {
return terminalHandle;
}
/**
* 设置 自助终端办理 （否.否，是.是）
*
* @param terminalHandle
*/
public void setTerminalHandle(String terminalHandle){
public void setTerminalHandle(String terminalHandle) {
this.terminalHandle = terminalHandle;
}
/**
* 获取 是否网办 （否.否，是.是）
*
* @return String
*/
public String getIsOnline(){
public String getIsOnline() {
return isOnline;
}
/**
* 设置 是否网办 （否.否，是.是）
*
* @param isOnline
*/
public void setIsOnline(String isOnline){
public void setIsOnline(String isOnline) {
this.isOnline = isOnline;
}
/**
* 获取 支持网上支付（否.否，是.是）
*
* @return String
*/
public String getIsOnlinePayShow(){
public String getIsOnlinePayShow() {
return isOnlinePayShow;
}
/**
* 设置 支持网上支付（否.否，是.是）
*
* @param isOnlinePayShow
*/
public void setIsOnlinePayShow(String isOnlinePayShow){
public void setIsOnlinePayShow(String isOnlinePayShow) {
this.isOnlinePayShow = isOnlinePayShow;
}
/**
* 获取 委托部门（否.否，是.是）
*
* @return String
*/
public String getEntrustmentDepartmen(){
public String getEntrustmentDepartmen() {
return entrustmentDepartmen;
}
/**
* 设置 委托部门（否.否，是.是）
*
* @param entrustmentDepartmen
*/
public void setEntrustmentDepartmen(String entrustmentDepartmen){
public void setEntrustmentDepartmen(String entrustmentDepartmen) {
this.entrustmentDepartmen = entrustmentDepartmen;
}
/**
* 获取 联办机构
*
* @return String
*/
public String getJointInfoShow(){
public String getJointInfoShow() {
return jointInfoShow;
}
/**
* 设置 联办机构
*
* @param jointInfoShow
*/
public void setJointInfoShow(String jointInfoShow){
public void setJointInfoShow(String jointInfoShow) {
this.jointInfoShow = jointInfoShow;
}
/**
* 获取 事项状态（停用.停用，在用.在用）
*
* @return String
*/
public String getMatterStatus(){
public String getMatterStatus() {
return matterStatus;
}
/**
* 设置 事项状态（停用.停用，在用.在用）
*
* @param matterStatus
*/
public void setMatterStatus(String matterStatus){
public void setMatterStatus(String matterStatus) {
this.matterStatus = matterStatus;
}
/**
* 获取 数量限制
*
* @return Long
*/
public Long getNumberLimit(){
public Long getNumberLimit() {
return numberLimit;
}
/**
* 设置 数量限制
*
* @param numberLimit
*/
public void setNumberLimit(Long numberLimit){
public void setNumberLimit(Long numberLimit) {
this.numberLimit = numberLimit;
}
/**
* 获取 主题类型
*
* @return String
*/
public String getType(){
public String getType() {
return type;
}
/**
* 设置 主题类型
*
* @param type
*/
public void setType(String type){
public void setType(String type) {
this.type = type;
}
/**
* 获取 基本编码
*
* @return String
*/
public String getBaseCode(){
public String getBaseCode() {
return baseCode;
}
/**
* 设置 基本编码
*
* @param baseCode
*/
public void setBaseCode(String baseCode){
public void setBaseCode(String baseCode) {
this.baseCode = baseCode;
}
/**
* 获取 实施编码
*
* @return String
*/
public String getImplementCode(){
public String getImplementCode() {
return implementCode;
}
/**
* 设置 实施编码
*
* @param implementCode
*/
public void setImplementCode(String implementCode){
public void setImplementCode(String implementCode) {
this.implementCode = implementCode;
}
/**
* 获取 实施主体编码
*
* @return String
*/
public String getImplementBodyCode(){
public String getImplementBodyCode() {
return implementBodyCode;
}
/**
* 设置 实施主体编码
*
* @param implementBodyCode
*/
public void setImplementBodyCode(String implementBodyCode){
public void setImplementBodyCode(String implementBodyCode) {
this.implementBodyCode = implementBodyCode;
}
/**
* 获取 办理项编码
*
* @return String
*/
public String getOperateItemCode(){
public String getOperateItemCode() {
return operateItemCode;
}
/**
* 设置 办理项编码
*
* @param operateItemCode
*/
public void setOperateItemCode(String operateItemCode){
public void setOperateItemCode(String operateItemCode) {
this.operateItemCode = operateItemCode;
}
/**
* 获取 乡镇街道名称
*
* @return String
*/
public String getTownshipName(){
public String getTownshipName() {
return townshipName;
}
/**
* 设置 乡镇街道名称
*
* @param townshipName
*/
public void setTownshipName(String townshipName){
public void setTownshipName(String townshipName) {
this.townshipName = townshipName;
}
/**
* 获取 乡镇街道代码
*
* @return String
*/
public String getTownshipCode(){
public String getTownshipCode() {
return townshipCode;
}
/**
* 设置 乡镇街道代码
*
* @param townshipCode
*/
public void setTownshipCode(String townshipCode){
public void setTownshipCode(String townshipCode) {
this.townshipCode = townshipCode;
}
/**
* 获取 村居社区名称
*
* @return String
*/
public String getVillageName(){
public String getVillageName() {
return villageName;
}
/**
* 设置 村居社区名称
*
* @param villageName
*/
public void setVillageName(String villageName){
public void setVillageName(String villageName) {
this.villageName = villageName;
}
/**
* 获取 村居社区代码
*
* @return String
*/
public String getVillageCode(){
public String getVillageCode() {
return villageCode;
}
/**
* 设置 村居社区代码
*
* @param villageCode
*/
public void setVillageCode(String villageCode){
public void setVillageCode(String villageCode) {
this.villageCode = villageCode;
}
/**
* 获取 办理时间
*
* @return String
*/
public String getOperateTime(){
public String getOperateTime() {
return operateTime;
}
/**
* 设置 办理时间
*
* @param operateTime
*/
public void setOperateTime(String operateTime){
public void setOperateTime(String operateTime) {
this.operateTime = operateTime;
}
/**
* 获取 办理地点
*
* @return String
*/
public String getOperateSite(){
public String getOperateSite() {
return operateSite;
}
/**
* 设置 办理地点
*
* @param operateSite
*/
public void setOperateSite(String operateSite){
public void setOperateSite(String operateSite) {
this.operateSite = operateSite;
}
/**
* 获取 咨询方式
*
* @return String
*/
public String getCousultingShow(){
public String getCousultingShow() {
return cousultingShow;
}
/**
* 设置 咨询方式
*
* @param cousultingShow
*/
public void setCousultingShow(String cousultingShow){
public void setCousultingShow(String cousultingShow) {
this.cousultingShow = cousultingShow;
}
/**
* 获取 咨询电话
*
* @return String
*/
public String getCousultingTelephoneShow(){
public String getCousultingTelephoneShow() {
return cousultingTelephoneShow;
}
/**
* 设置 咨询电话
*
* @param cousultingTelephoneShow
*/
public void setCousultingTelephoneShow(String cousultingTelephoneShow){
public void setCousultingTelephoneShow(String cousultingTelephoneShow) {
this.cousultingTelephoneShow = cousultingTelephoneShow;
}
/**
* 获取 监督投诉方式
*
* @return String
*/
public String getSuperviseShow(){
public String getSuperviseShow() {
return superviseShow;
}
/**
* 设置 监督投诉方式
*
* @param superviseShow
*/
public void setSuperviseShow(String superviseShow){
public void setSuperviseShow(String superviseShow) {
this.superviseShow = superviseShow;
}
/**
* 获取 排序
*
* @return Integer
*/
public Integer getSort(){
public Integer getSort() {
return sort;
}
/**
* 设置 排序
*
* @param sort
*/
public void setSort(Integer sort){
public void setSort(Integer sort) {
this.sort = sort;
}
/**
* 获取 事项来源(0.政务网，1.自定义)
*
* @return Integer
*/
public Integer getSource(){
public Integer getSource() {
return source;
}
/**
* 设置 事项来源(0.政务网，1.自定义)
*
* @param source
*/
public void setSource(Integer source){
public void setSource(Integer source) {
this.source = source;
}
/**
* 获取 评价地址
*
* @return String
*/
public String getEvaluationUrl(){
public String getEvaluationUrl() {
return evaluationUrl;
}
/**
* 设置 评价地址
*
* @param evaluationUrl
*/
public void setEvaluationUrl(String evaluationUrl){
public void setEvaluationUrl(String evaluationUrl) {
this.evaluationUrl = evaluationUrl;
}
/**
* 获取 申请地址
*
* @return String
*/
public String getNetApplyUrl(){
public String getNetApplyUrl() {
return netApplyUrl;
}
/**
* 设置 申请地址
*
* @param netApplyUrl
*/
public void setNetApplyUrl(String netApplyUrl){
public void setNetApplyUrl(String netApplyUrl) {
this.netApplyUrl = netApplyUrl;
}
public List<MatterExtEntity> getMatterExtList(){
public List<MatterExtEntity> getMatterExtList() {
return matterExtList;
}
public void setMatterExtList(List<MatterExtEntity> matterExtList){
public void setMatterExtList(List<MatterExtEntity> matterExtList) {
this.matterExtList = matterExtList;
}
......@@ -1391,6 +1696,7 @@ public class MatterEntity extends MatterVo {
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
......@@ -1403,7 +1709,7 @@ public class MatterEntity extends MatterVo {
return false;
}
public String toString(){
public String toString() {
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",tid:").append(getTid());
......@@ -1483,11 +1789,11 @@ public class MatterEntity extends MatterVo {
return sb.toString();
}
public void initAttrValue(){
public void initAttrValue() {
this.siteId = -1L;
this.tid = null;
this.tid = "";
this.tcode = "";
......@@ -1497,23 +1803,23 @@ public class MatterEntity extends MatterVo {
this.englishName = "";
this.matterNo = null;
this.matterNo = "";
this.areaCode = null;
this.areaCode = "";
this.deptCode = "";
this.deptName = "";
this.powerCode = null;
this.powerCode = "";
this.themeCode = null;
this.themeCode = "";
this.usertypeCode = null;
this.usertypeCode = "";
this.groupName = null;
this.groupName = "";
this.url = null;
this.url = "";
this.haveGetMatterInfo = "false";
......@@ -1527,13 +1833,13 @@ public class MatterEntity extends MatterVo {
this.handleType = "窗口办理";
this.legalTimeLimitShow = null;
this.legalTimeLimitShow = "";
this.legalEndExplain = null;
this.legalEndExplain = "";
this.promiseTimeLimitShow = null;
this.promiseTimeLimitShow = "";
this.promiseEndExplain = null;
this.promiseEndExplain = "";
this.isChargesShow = "否";
......@@ -1543,7 +1849,7 @@ public class MatterEntity extends MatterVo {
this.promiseTakeTime = null;
this.specialProcedure = null;
this.specialProcedure = "";
this.windowToTheSceneNum = null;
......@@ -1555,7 +1861,7 @@ public class MatterEntity extends MatterVo {
this.isApplyProvinceShow = "否";
this.mustSceneExplain = null;
this.mustSceneExplain = "";
this.onlineType = "原件预审";
......@@ -1563,23 +1869,23 @@ public class MatterEntity extends MatterVo {
this.onlineOperatDeep = "互联网咨询";
this.isExpressTakeOnlineShow = null;
this.isExpressTakeOnlineShow = "";
this.isDoorTakeShow = "否";
this.onlineMustSceneExplain = null;
this.onlineMustSceneExplain = "";
this.performDeptType = null;
this.performDeptType = "";
this.matterEdition = null;
this.matterEdition = "";
this.eventTypeShow = "行政许可";
this.performHierarchyShow = null;
this.performHierarchyShow = "";
this.powerSourceShow = null;
this.powerSourceShow = "";
this.performDeptTypeShow = null;
this.performDeptTypeShow = "";
this.goveServiceCenterShow = "否";
......@@ -1593,7 +1899,7 @@ public class MatterEntity extends MatterVo {
this.entrustmentDepartmen = "是";
this.jointInfoShow = null;
this.jointInfoShow = "";
this.matterStatus = "在用";
......@@ -1601,31 +1907,31 @@ public class MatterEntity extends MatterVo {
this.type = "";
this.baseCode = null;
this.baseCode = "";
this.implementCode = null;
this.implementCode = "";
this.implementBodyCode = null;
this.implementBodyCode = "";
this.operateItemCode = null;
this.operateItemCode = "";
this.townshipName = null;
this.townshipName = "";
this.townshipCode = null;
this.townshipCode = "";
this.villageName = null;
this.villageName = "";
this.villageCode = null;
this.villageCode = "";
this.operateTime = null;
this.operateTime = "";
this.operateSite = null;
this.operateSite = "";
this.cousultingShow = null;
this.cousultingShow = "";
this.cousultingTelephoneShow = null;
this.cousultingTelephoneShow = "";
this.superviseShow = null;
this.superviseShow = "";
this.sort = 0;
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ 04a3bf20
......@@ -986,6 +986,14 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
Setting baseInfoSetting = interceptorConfig.getBaseInfoSetting();
Setting sqclInfoSetting = interceptorConfig.getSqclInfoSetting();
//更新部门信息
DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode());
matterEntity.setDeptName(extCache==null?"":extCache.getName());
/* if(!ObjectUtils.isEmpty(matterEntity.getDeptCode())&&ObjectUtils.isEmpty(matterEntity.getDeptName())){
DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode());
matterEntity.setDeptName(extCache==null?"":extCache.getName());
}*/
//构建基础信息参数
savebaseInfo(matterEntity, dom, baseInfoSetting);
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteBusinessQuery.java
View file @ 04a3bf20
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.site.model;
import java.util.List;
import com.mortals.xhx.module.site.model.SiteBusinessEntity;
/**
* 站点事项查询对象
*
* @author zxfei
* @date 2022-01-13
*/
* 站点业务查询对象
*
* @author zxfei
* @date 2023-02-08
*/
public class SiteBusinessQuery extends SiteBusinessEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -21,6 +21,9 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */
private Long siteIdStart;
......@@ -33,9 +36,15 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 站点名称 */
private List<String> siteNameList;
/** 祖级列表，逗号分隔 */
private List<String> ancestorsList;
/** 开始 业务ID */
private Long businessIdStart;
......@@ -48,35 +57,8 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
/** 业务ID列表 */
private List <Long> businessIdList;
/** 业务名称 */
private List<String> businessNameList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 开始 修改时间 */
private String updateTimeStart;
/** 结束 修改时间 */
private String updateTimeEnd;
/** 祖级列表，逗号分隔 */
private List<String> ancestorsList;
/** 业务ID排除列表 */
private List <Long> businessIdNotList;
/** 开始 业务类型(0.一级业务,1.二级业务) */
private Integer isBusinessStart;
......@@ -90,6 +72,9 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
/** 业务类型(0.一级业务,1.二级业务)列表 */
private List <Integer> isBusinessList;
/** 业务类型(0.一级业务,1.二级业务)排除列表 */
private List <Integer> isBusinessNotList;
/** 开始 业务父级ID */
private Long parentIdStart;
......@@ -102,6 +87,12 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
/** 业务父级ID列表 */
private List <Long> parentIdList;
/** 业务父级ID排除列表 */
private List <Long> parentIdNotList;
/** 业务名称 */
private List<String> businessNameList;
/** 开始 业务状态 (0.停用，1.正常) */
private Integer statusStart;
......@@ -114,6 +105,36 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
/** 业务状态 (0.停用，1.正常)列表 */
private List <Integer> statusList;
/** 业务状态 (0.停用，1.正常)排除列表 */
private List <Integer> statusNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */
private String updateTimeStart;
/** 结束 修改时间 */
private String updateTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteBusinessQuery> orConditionList;
......@@ -186,6 +207,23 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
......@@ -250,6 +288,23 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点名称
* @return siteNameList
......@@ -265,6 +320,21 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
* 获取 祖级列表，逗号分隔
* @return ancestorsList
*/
public List<String> getAncestorsList(){
return this.ancestorsList;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestorsList
*/
public void setAncestorsList(List<String> ancestorsList){
this.ancestorsList = ancestorsList;
}
/**
* 获取 开始 业务ID
* @return businessIdStart
......@@ -330,353 +400,423 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
}
/**
* 获取 业务名称
* @return businessNameList
* 获取 业务ID
* @return businessIdNotList
*/
public List<String> getBusinessNameList(){
return this.businessNameList;
public List<Long> getBusinessIdNotList(){
return this.businessIdNotList;
}
/**
* 设置 业务名称
* @param businessNameList
* 设置 业务ID
* @param businessIdList
*/
public void setBusinessNameList(List<String> businessNameList){
this.businessNameList = businessNameList;
public void setBusinessIdNotList(List<Long> businessIdNotList){
this.businessIdNotList = businessIdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
* 获取 开始 业务类型(0.一级业务,1.二级业务)
* @return isBusinessStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
public Integer getIsBusinessStart(){
return this.isBusinessStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
* 设置 开始 业务类型(0.一级业务,1.二级业务)
* @param isBusinessStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
public void setIsBusinessStart(Integer isBusinessStart){
this.isBusinessStart = isBusinessStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
* 获取 结束 业务类型(0.一级业务,1.二级业务)
* @return $isBusinessEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
public Integer getIsBusinessEnd(){
return this.isBusinessEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
* 设置 结束 业务类型(0.一级业务,1.二级业务)
* @param isBusinessEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
public void setIsBusinessEnd(Integer isBusinessEnd){
this.isBusinessEnd = isBusinessEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
* 获取 增加 业务类型(0.一级业务,1.二级业务)
* @return isBusinessIncrement
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
public Integer getIsBusinessIncrement(){
return this.isBusinessIncrement;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
* 设置 增加 业务类型(0.一级业务,1.二级业务)
* @param isBusinessIncrement
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
public void setIsBusinessIncrement(Integer isBusinessIncrement){
this.isBusinessIncrement = isBusinessIncrement;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
* 获取 业务类型(0.一级业务,1.二级业务)
* @return isBusinessList
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
public List<Integer> getIsBusinessList(){
return this.isBusinessList;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
* 设置 业务类型(0.一级业务,1.二级业务)
* @param isBusinessList
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
public void setIsBusinessList(List<Integer> isBusinessList){
this.isBusinessList = isBusinessList;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
* 获取 业务类型(0.一级业务,1.二级业务)
* @return isBusinessNotList
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
public List<Integer> getIsBusinessNotList(){
return this.isBusinessNotList;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
* 设置 业务类型(0.一级业务,1.二级业务)
* @param isBusinessList
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
public void setIsBusinessNotList(List<Integer> isBusinessNotList){
this.isBusinessNotList = isBusinessNotList;
}
/**
* 获取 创建用户
* @return createUserIdList
* 获取 开始 业务父级ID
* @return parentIdStart
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
public Long getParentIdStart(){
return this.parentIdStart;
}
/**
* 设置 创建用户
* @param createUserIdList
* 设置 开始 业务父级ID
* @param parentIdStart
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
public void setParentIdStart(Long parentIdStart){
this.parentIdStart = parentIdStart;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
* 获取 结束 业务父级ID
* @return $parentIdEnd
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
public Long getParentIdEnd(){
return this.parentIdEnd;
}
/**
* 设置 开始 修改时间
* @param updateTimeStart
* 设置 结束 业务父级ID
* @param parentIdEnd
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
public void setParentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd;
}
/**
* 获取 结束 修改时间
* @return updateTimeEnd
* 获取 增加 业务父级ID
* @return parentIdIncrement
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
public Long getParentIdIncrement(){
return this.parentIdIncrement;
}
/**
* 设置 结束 修改时间
* @param updateTimeEnd
* 设置 增加 业务父级ID
* @param parentIdIncrement
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
public void setParentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement;
}
/**
* 获取 祖级列表，逗号分隔
* @return ancestorsList
* 获取 业务父级ID
* @return parentIdList
*/
public List<String> getAncestorsList(){
return this.ancestorsList;
public List<Long> getParentIdList(){
return this.parentIdList;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestorsList
* 设置 业务父级ID
* @param parentIdList
*/
public void setAncestorsList(List<String> ancestorsList){
this.ancestorsList = ancestorsList;
public void setParentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList;
}
/**
* 获取 开始 业务类型(0.一级业务,1.二级业务)
* @return isBusinessStart
* 获取 业务父级ID
* @return parentIdNotList
*/
public Integer getIsBusinessStart(){
return this.isBusinessStart;
public List<Long> getParentIdNotList(){
return this.parentIdNotList;
}
/**
* 设置 开始 业务类型(0.一级业务,1.二级业务)
* @param isBusinessStart
* 设置 业务父级ID
* @param parentIdList
*/
public void setIsBusinessStart(Integer isBusinessStart){
this.isBusinessStart = isBusinessStart;
public void setParentIdNotList(List<Long> parentIdNotList){
this.parentIdNotList = parentIdNotList;
}
/**
* 获取 结束 业务类型(0.一级业务,1.二级业务)
* @return $isBusinessEnd
* 获取 业务名称
* @return businessNameList
*/
public Integer getIsBusinessEnd(){
return this.isBusinessEnd;
public List<String> getBusinessNameList(){
return this.businessNameList;
}
/**
* 设置 结束 业务类型(0.一级业务,1.二级业务)
* @param isBusinessEnd
* 设置 业务名称
* @param businessNameList
*/
public void setIsBusinessEnd(Integer isBusinessEnd){
this.isBusinessEnd = isBusinessEnd;
public void setBusinessNameList(List<String> businessNameList){
this.businessNameList = businessNameList;
}
/**
* 获取 开始 业务状态 (0.停用，1.正常)
* @return statusStart
*/
public Integer getStatusStart(){
return this.statusStart;
}
/**
* 获取 增加 业务类型(0.一级业务,1.二级业务)
* @return isBusinessIncrement
* 设置 开始 业务状态 (0.停用，1.正常)
* @param statusStart
*/
public Integer getIsBusinessIncrement(){
return this.isBusinessIncrement;
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
}
/**
* 设置 增加 业务类型(0.一级业务,1.二级业务)
* @param isBusinessIncrement
* 获取 结束 业务状态 (0.停用，1.正常)
* @return $statusEnd
*/
public void setIsBusinessIncrement(Integer isBusinessIncrement){
this.isBusinessIncrement = isBusinessIncrement;
public Integer getStatusEnd(){
return this.statusEnd;
}
/**
* 获取 业务类型(0.一级业务,1.二级业务)
* @return isBusinessList
* 设置 结束 业务状态 (0.停用，1.正常)
* @param statusEnd
*/
public List<Integer> getIsBusinessList(){
return this.isBusinessList;
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
}
/**
* 设置 业务类型(0.一级业务,1.二级业务)
* @param isBusinessList
* 获取 增加 业务状态 (0.停用，1.正常)
* @return statusIncrement
*/
public void setIsBusinessList(List<Integer> isBusinessList){
this.isBusinessList = isBusinessList;
public Integer getStatusIncrement(){
return this.statusIncrement;
}
/**
* 获取 开始 业务父级ID
* @return parentIdStart
* 设置 增加 业务状态 (0.停用，1.正常)
* @param statusIncrement
*/
public Long getParentIdStart(){
return this.parentIdStart;
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
}
/**
* 设置 开始 业务父级ID
* @param parentIdStart
* 获取 业务状态 (0.停用，1.正常)
* @return statusList
*/
public void setParentIdStart(Long parentIdStart){
this.parentIdStart = parentIdStart;
public List<Integer> getStatusList(){
return this.statusList;
}
/**
* 获取 结束 业务父级ID
* @return $parentIdEnd
* 设置 业务状态 (0.停用，1.正常)
* @param statusList
*/
public Long getParentIdEnd(){
return this.parentIdEnd;
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
}
/**
* 设置 结束 业务父级ID
* @param parentIdEnd
* 获取 业务状态 (0.停用，1.正常)
* @return statusNotList
*/
public void setParentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd;
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 获取 增加 业务父级ID
* @return parentIdIncrement
* 设置 业务状态 (0.停用，1.正常)
* @param statusList
*/
public Long getParentIdIncrement(){
return this.parentIdIncrement;
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/**
* 设置 增加 业务父级ID
* @param parentIdIncrement
* 获取 开始 创建时间
* @return createTimeStart
*/
public void setParentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement;
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 获取 业务父级ID
* @return parentIdList
* 设置 开始 创建时间
* @param createTimeStart
*/
public List<Long> getParentIdList(){
return this.parentIdList;
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 设置 业务父级ID
* @param parentIdList
* 获取 结束 创建时间
* @return createTimeEnd
*/
public void setParentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList;
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 获取 开始 业务状态 (0.停用，1.正常)
* @return statusStart
* 设置 结束 创建时间
* @param createTimeEnd
*/
public Integer getStatusStart(){
return this.statusStart;
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 设置 开始 业务状态 (0.停用，1.正常)
* @param statusStart
* 获取 开始 创建用户
* @return createUserIdStart
*/
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 获取 结束 业务状态 (0.停用，1.正常)
* @return $statusEnd
* 设置 开始 创建用户
* @param createUserIdStart
*/
public Integer getStatusEnd(){
return this.statusEnd;
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 设置 结束 业务状态 (0.停用，1.正常)
* @param statusEnd
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 获取 增加 业务状态 (0.停用，1.正常)
* @return statusIncrement
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public Integer getStatusIncrement(){
return this.statusIncrement;
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 设置 增加 业务状态 (0.停用，1.正常)
* @param statusIncrement
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 获取 业务状态 (0.停用，1.正常)
* @return statusList
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public List<Integer> getStatusList(){
return this.statusList;
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 设置 业务状态 (0.停用，1.正常)
* @param statusList
* 获取 创建用户
* @return createUserIdList
*/
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 修改时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 修改时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 修改时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
......@@ -724,6 +864,15 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public SiteBusinessQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点ID
* @param siteId
......@@ -769,6 +918,15 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public SiteBusinessQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 站点名称
......@@ -788,6 +946,25 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestors
*/
public SiteBusinessQuery ancestors(String ancestors){
setAncestors(ancestors);
return this;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestorsList
*/
public SiteBusinessQuery ancestorsList(List<String> ancestorsList){
this.ancestorsList = ancestorsList;
return this;
}
/**
* 设置 业务ID
* @param businessId
......@@ -833,88 +1010,12 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 业务名称
* @param businessName
*/
public SiteBusinessQuery businessName(String businessName){
setBusinessName(businessName);
return this;
}
/**
* 设置 业务名称
* @param businessNameList
*/
public SiteBusinessQuery businessNameList(List<String> businessNameList){
this.businessNameList = businessNameList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public SiteBusinessQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public SiteBusinessQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public SiteBusinessQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public SiteBusinessQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public SiteBusinessQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestors
*/
public SiteBusinessQuery ancestors(String ancestors){
setAncestors(ancestors);
return this;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestorsList
* 设置 业务ID
* @param businessIdNotList
*/
public SiteBusinessQuery ancestorsList(List<String> ancestorsList){
this.ancestorsList = ancestorsList;
public SiteBusinessQuery businessIdNotList(List<Long> businessIdNotList){
this.businessIdNotList = businessIdNotList;
return this;
}
......@@ -963,6 +1064,15 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 业务类型(0.一级业务,1.二级业务)
* @param isBusinessNotList
*/
public SiteBusinessQuery isBusinessNotList(List<Integer> isBusinessNotList){
this.isBusinessNotList = isBusinessNotList;
return this;
}
/**
* 设置 业务父级ID
* @param parentId
......@@ -1008,6 +1118,34 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 业务父级ID
* @param parentIdNotList
*/
public SiteBusinessQuery parentIdNotList(List<Long> parentIdNotList){
this.parentIdNotList = parentIdNotList;
return this;
}
/**
* 设置 业务名称
* @param businessName
*/
public SiteBusinessQuery businessName(String businessName){
setBusinessName(businessName);
return this;
}
/**
* 设置 业务名称
* @param businessNameList
*/
public SiteBusinessQuery businessNameList(List<String> businessNameList){
this.businessNameList = businessNameList;
return this;
}
/**
* 设置 业务状态 (0.停用，1.正常)
* @param status
......@@ -1053,6 +1191,71 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
return this;
}
/**
* 设置 业务状态 (0.停用，1.正常)
* @param statusNotList
*/
public SiteBusinessQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public SiteBusinessQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public SiteBusinessQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public SiteBusinessQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public SiteBusinessQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public SiteBusinessQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SiteBusinessQuery 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)
* @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
View file @ 04a3bf20
......@@ -51,5 +51,6 @@ public class SiteBusinessVo extends BaseEntityLong {
private Integer businessType;
private List<Long> idNotList;
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java
View file @ 04a3bf20
......@@ -105,7 +105,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
siteMatterQuery.setSiteId(siteId);
siteMatterQuery.setMatterCodeList(matterCodeList);
List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(siteMatterQuery, context);
log.info(String.format("size1:%s,size2:%s", allList.size(), siteMatterEntities.size()));
log.info(String.format("抓取数量:%s,本地数量:%s", allList.size(), siteMatterEntities.size()));
if (!ObjectUtils.isEmpty(siteMatterEntities)) {
List<SiteThemeMatterEntity> collect = siteMatterEntities.stream().map(siteMatterEntity -> {
SiteThemeMatterEntity siteThemeMatterEntity = new SiteThemeMatterEntity();
......
base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java
View file @ 04a3bf20
......@@ -40,6 +40,8 @@ public interface WorkmanService extends ICRUDCacheService<WorkmanEntity,Long> {
*/
boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
boolean updateUserPwd(String loginName, String newPwd) throws AppException;
......
base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
View file @ 04a3bf20
......@@ -61,8 +61,8 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
if (StringUtils.isNull(entity.getLoginPwd())) {
throw new AppException("密码不能为空！");
}
int count = this.count(new WorkmanQuery().loginName(entity.getLoginName()),context);
if (count>0) {
int count = this.count(new WorkmanQuery().loginName(entity.getLoginName()), context);
if (count > 0) {
throw new AppException("账号已存在！");
}
......@@ -123,13 +123,34 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
if (sysUser == null || !sysUser.getLoginName().equals(loginName)) {
throw new AppException("帐号错误！");
}
// try {
// if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) {
// throw new AppException("原始密码错误！");
// }
// } catch (Exception e) {
// throw new AppException("密码验认出错！", e);
// }
try {
if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) {
throw new AppException("原始密码错误！");
}
} catch (Exception e) {
throw new AppException("密码验认出错！", e);
}
try {
sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
} catch (Exception e) {
throw new AppException("密码转换异常！", e);
}
dao.update(sysUser);
return true;
}
/**
* @param loginName
* @param newPwd
* @return
* @throws AppException
*/
@Override
public boolean updateUserPwd(String loginName, String newPwd) throws AppException {
WorkmanEntity sysUser = this.selectOne(new WorkmanQuery().loginName(loginName));
if (sysUser == null || !sysUser.getLoginName().equals(loginName)) {
throw new AppException("帐号错误！");
}
try {
sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
} catch (Exception e) {
......@@ -152,11 +173,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
throw new AppException("文件不存在！");
}
//解压图片
String fileEncode ="UTF-8";
String fileEncode = "UTF-8";
try {
fileEncode = EncodeUtil.getEncode(targetFilePath,true);
fileEncode = EncodeUtil.getEncode(targetFilePath, true);
} catch (Exception e) {
log.error("异常",e);
log.error("异常", e);
}
ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode));
//读取目录下的所有图片
......
base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ 04a3bf20
......@@ -133,6 +133,27 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
@RequestMapping(value = "change/password", method = RequestMethod.POST)
@UnAuth
public String changePassword(@RequestBody WorkmanEntity query) {
JSONObject ret = new JSONObject();
try {
boolean bool = service.updateUserPwd(query.getLoginName(), query.getNewPwd());
if (bool) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "密码修改成功！");
} else {
throw new AppException("账户密码修改失败！");
}
} catch (Exception e) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
}
return ret.toJSONString();
}
@RequestMapping(value = "person/change/password", method = RequestMethod.POST)
@UnAuth
public String personChangePassword(@RequestBody WorkmanEntity query) {
JSONObject ret = new JSONObject();
try {
boolean bool = service.updateUserPwd(query.getLoginName(), query.getOldPwd(), query.getNewPwd());
......@@ -188,8 +209,8 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
workmanEntity.setLoginName(loginName);
}
log.info("loginPwd:"+workmanEntity.getLoginPwd());
if (ObjectUtils.isEmpty(workmanEntity.getLoginPwd())||"".equals(workmanEntity.getLoginPwd().trim())) {
log.info("loginPwd:" + workmanEntity.getLoginPwd());
if (ObjectUtils.isEmpty(workmanEntity.getLoginPwd()) || "".equals(workmanEntity.getLoginPwd().trim())) {
workmanEntity.setLoginPwd("123");
}
......
base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml
View file @ 04a3bf20
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.site.dao.ibatis.SiteBusinessDaoImpl">
<!-- 字段和属性映射 -->
......@@ -8,15 +8,15 @@
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="siteName" column="siteName" />
<result property="ancestors" column="ancestors" />
<result property="businessId" column="businessId" />
<result property="isBusiness" column="isBusiness" />
<result property="parentId" column="parentId" />
<result property="businessName" column="businessName" />
<result property="status" column="status" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="ancestors" column="ancestors" />
<result property="isBusiness" column="isBusiness" />
<result property="parentId" column="parentId" />
<result property="status" column="status" />
</resultMap>
......@@ -25,58 +25,58 @@
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id,
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId as siteId,
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName as siteName,
a.siteName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
a.ancestors,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessId') or colPickMode == 1 and data.containsKey('businessId')))">
a.businessId as businessId,
a.businessId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isBusiness') or colPickMode == 1 and data.containsKey('isBusiness')))">
a.isBusiness,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
a.parentId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessName') or colPickMode == 1 and data.containsKey('businessName')))">
a.businessName as businessName,
a.businessName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime,
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId,
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
a.ancestors as ancestors,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isBusiness') or colPickMode == 1 and data.containsKey('isBusiness')))">
a.isBusiness as isBusiness,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
a.parentId as parentId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status as status,
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteBusinessEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_business
(siteId,siteName,businessId,businessName,createTime,createUserId,updateTime,ancestors,isBusiness,parentId,status)
(siteId,siteName,ancestors,businessId,isBusiness,parentId,businessName,status,createTime,createUserId,updateTime)
VALUES
(#{siteId},#{siteName},#{businessId},#{businessName},#{createTime},#{createUserId},#{updateTime},#{ancestors},#{isBusiness},#{parentId},#{status})
(#{siteId},#{siteName},#{ancestors},#{businessId},#{isBusiness},#{parentId},#{businessName},#{status},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_business
(siteId,siteName,businessId,businessName,createTime,createUserId,updateTime,ancestors,isBusiness,parentId,status)
(siteId,siteName,ancestors,businessId,isBusiness,parentId,businessName,status,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.businessId},#{item.businessName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.ancestors},#{item.isBusiness},#{item.parentId},#{item.status})
(#{item.siteId},#{item.siteName},#{item.ancestors},#{item.businessId},#{item.isBusiness},#{item.parentId},#{item.businessName},#{item.status},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -95,30 +95,15 @@
<if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
a.siteName=#{data.siteName},
</if>
<if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
a.ancestors=#{data.ancestors},
</if>
<if test="(colPickMode==0 and data.containsKey('businessId')) or (colPickMode==1 and !data.containsKey('businessId'))">
a.businessId=#{data.businessId},
</if>
<if test="(colPickMode==0 and data.containsKey('businessIdIncrement')) or (colPickMode==1 and !data.containsKey('businessIdIncrement'))">
a.businessId=ifnull(a.businessId,0) + #{data.businessIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('businessName')) or (colPickMode==1 and !data.containsKey('businessName'))">
a.businessName=#{data.businessName},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
a.ancestors=#{data.ancestors},
</if>
<if test="(colPickMode==0 and data.containsKey('isBusiness')) or (colPickMode==1 and !data.containsKey('isBusiness'))">
a.isBusiness=#{data.isBusiness},
</if>
......@@ -131,12 +116,27 @@
<if test="(colPickMode==0 and data.containsKey('parentIdIncrement')) or (colPickMode==1 and !data.containsKey('parentIdIncrement'))">
a.parentId=ifnull(a.parentId,0) + #{data.parentIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('businessName')) or (colPickMode==1 and !data.containsKey('businessName'))">
a.businessName=#{data.businessName},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -168,6 +168,13 @@
</if>
</foreach>
</trim>
<trim prefix="ancestors=(case" suffix="ELSE ancestors end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
when a.id=#{item.id} then #{item.ancestors}
</if>
</foreach>
</trim>
<trim prefix="businessId=(case" suffix="ELSE businessId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -180,46 +187,6 @@
</choose>
</foreach>
</trim>
<trim prefix="businessName=(case" suffix="ELSE businessName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('businessName')) or (colPickMode==1 and !item.containsKey('businessName'))">
when a.id=#{item.id} then #{item.businessName}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="ancestors=(case" suffix="ELSE ancestors end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
when a.id=#{item.id} then #{item.ancestors}
</if>
</foreach>
</trim>
<trim prefix="isBusiness=(case" suffix="ELSE isBusiness end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -244,6 +211,13 @@
</choose>
</foreach>
</trim>
<trim prefix="businessName=(case" suffix="ELSE businessName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('businessName')) or (colPickMode==1 and !item.containsKey('businessName'))">
when a.id=#{item.id} then #{item.businessName}
</if>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -256,6 +230,32 @@
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -279,6 +279,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_site_business where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_site_business where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_site_business as a
......@@ -303,10 +318,6 @@
</select>
<!-- 获取子节点 -->
<select id="selectChildrenSiteBusinessById" parameterType="String" resultMap="SiteBusinessEntity-Map">
select * from mortals_sys_site_business as a where find_in_set(#{siteBusinessId}, ancestors)
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
......@@ -375,6 +386,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
......@@ -396,6 +413,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList')">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
......@@ -418,6 +441,21 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ancestors')">
<if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
</if>
<if test="conditionParamRef.ancestors == null">
${_conditionType_} a.ancestors is null
</if>
</if>
<if test="conditionParamRef.containsKey('ancestorsList')">
${_conditionType_} a.ancestors in
<foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessId')">
<if test="conditionParamRef.businessId != null ">
${_conditionType_} a.businessId = #{${_conditionParam_}.businessId}
......@@ -432,6 +470,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessIdNotList')">
${_conditionType_} a.businessId not in
<foreach collection="conditionParamRef.businessIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessIdStart') and conditionParamRef.businessIdStart != null">
${_conditionType_} a.businessId <![CDATA[ >= ]]> #{${_conditionParam_}.businessIdStart}
</if>
......@@ -439,6 +483,60 @@
${_conditionType_} a.businessId <![CDATA[ <= ]]> #{${_conditionParam_}.businessIdEnd}
</if>
<if test="conditionParamRef.containsKey('isBusiness')">
<if test="conditionParamRef.isBusiness != null ">
${_conditionType_} a.isBusiness = #{${_conditionParam_}.isBusiness}
</if>
<if test="conditionParamRef.isBusiness == null">
${_conditionType_} a.isBusiness is null
</if>
</if>
<if test="conditionParamRef.containsKey('isBusinessList')">
${_conditionType_} a.isBusiness in
<foreach collection="conditionParamRef.isBusinessList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isBusinessNotList')">
${_conditionType_} a.isBusiness not in
<foreach collection="conditionParamRef.isBusinessNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isBusinessStart') and conditionParamRef.isBusinessStart != null">
${_conditionType_} a.isBusiness <![CDATA[ >= ]]> #{${_conditionParam_}.isBusinessStart}
</if>
<if test="conditionParamRef.containsKey('isBusinessEnd') and conditionParamRef.isBusinessEnd != null">
${_conditionType_} a.isBusiness <![CDATA[ <= ]]> #{${_conditionParam_}.isBusinessEnd}
</if>
<if test="conditionParamRef.containsKey('parentId')">
<if test="conditionParamRef.parentId != null ">
${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
</if>
<if test="conditionParamRef.parentId == null">
${_conditionType_} a.parentId is null
</if>
</if>
<if test="conditionParamRef.containsKey('parentIdList')">
${_conditionType_} a.parentId in
<foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentIdNotList')">
${_conditionType_} a.parentId not in
<foreach collection="conditionParamRef.parentIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
</if>
<if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
</if>
<if test="conditionParamRef.containsKey('businessName')">
<if test="conditionParamRef.businessName != null and conditionParamRef.businessName != ''">
......@@ -454,6 +552,33 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusNotList')">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
......@@ -483,6 +608,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
......@@ -505,84 +636,6 @@
<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')
</if>
<if test="conditionParamRef.containsKey('ancestors')">
<if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
</if>
<if test="conditionParamRef.ancestors == null">
${_conditionType_} a.ancestors is null
</if>
</if>
<if test="conditionParamRef.containsKey('ancestorsList')">
${_conditionType_} a.ancestors in
<foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isBusiness')">
<if test="conditionParamRef.isBusiness != null ">
${_conditionType_} a.isBusiness = #{${_conditionParam_}.isBusiness}
</if>
<if test="conditionParamRef.isBusiness == null">
${_conditionType_} a.isBusiness is null
</if>
</if>
<if test="conditionParamRef.containsKey('isBusinessList')">
${_conditionType_} a.isBusiness in
<foreach collection="conditionParamRef.isBusinessList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isBusinessStart') and conditionParamRef.isBusinessStart != null">
${_conditionType_} a.isBusiness <![CDATA[ >= ]]> #{${_conditionParam_}.isBusinessStart}
</if>
<if test="conditionParamRef.containsKey('isBusinessEnd') and conditionParamRef.isBusinessEnd != null">
${_conditionType_} a.isBusiness <![CDATA[ <= ]]> #{${_conditionParam_}.isBusinessEnd}
</if>
<if test="conditionParamRef.containsKey('parentId')">
<if test="conditionParamRef.parentId != null ">
${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
</if>
<if test="conditionParamRef.parentId == null">
${_conditionType_} a.parentId is null
</if>
</if>
<if test="conditionParamRef.containsKey('parentIdList')">
${_conditionType_} a.parentId in
<foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
</if>
<if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
</if>
<if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -611,16 +664,36 @@
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ancestors')">
a.ancestors
<if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('businessId')">
a.businessId
<if test='orderCol.businessId != null and "DESC".equalsIgnoreCase(orderCol.businessId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('isBusiness')">
a.isBusiness
<if test='orderCol.isBusiness != null and "DESC".equalsIgnoreCase(orderCol.isBusiness)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('parentId')">
a.parentId
<if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('businessName')">
a.businessName
<if test='orderCol.businessName != null and "DESC".equalsIgnoreCase(orderCol.businessName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......@@ -636,26 +709,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ancestors')">
a.ancestors
<if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('isBusiness')">
a.isBusiness
<if test='orderCol.isBusiness != null and "DESC".equalsIgnoreCase(orderCol.isBusiness)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('parentId')">
a.parentId
<if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http
View file @ 04a3bf20
###站点业务列表
POST {{baseUrl}}/site/business/list
Authorization: {{authToken}}
Content-Type: application/json
{
"idNotList": [11,12],
"siteId": 1,
"page":1,
"size":10
......
base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http
View file @ 04a3bf20
......@@ -5,7 +5,7 @@ Content-Type: application/json
{
"page": 1,
"size": 10
"size": 100
}
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ 04a3bf20
......@@ -45,8 +45,31 @@ Authorization: {{authToken}}
GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
Accept: application/json
###test Gov
POST {{baseUrl}}/test/testGov
Content-Type: application/json
{
"url":"http://172.15.28.113:8900"
}
###test Cookie
POST {{baseUrl}}/test/testCookie
Content-Type: application/json
{
"url":"http://172.15.28.113:8902"
}
###test Cookie
POST {{baseUrl}}/micro/getPicAndCookie
Content-Type: application/json
{
"url":"http://172.15.28.113:8902"
}
###短信设置编辑
GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
......
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