Skip to content

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

添加动态列表查询接口

parent b09835a0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 631 additions and 367 deletions
base-manager/db/base_modules.sql
View file @ 4266f4c7
......@@ -288,41 +288,43 @@ CREATE TABLE mortals_sys_window_matter
-- 工作人员表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_workman`;
CREATE TABLE `mortals_sys_workman`
(
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`loginName` varchar(64) DEFAULT NULL COMMENT '登录用户名',
`loginPwd` varchar(255) DEFAULT NULL COMMENT '密码',
`deptId` bigint(20) DEFAULT NULL COMMENT '部门id号',
`deptName` varchar(64) DEFAULT NULL COMMENT '部门名称',
`windowId` bigint(20) DEFAULT NULL COMMENT '窗口id号',
`windowName` varchar(64) DEFAULT NULL COMMENT '窗口名称',
`siteId` bigint(20) DEFAULT NULL COMMENT '站点ID',
`siteName` varchar(255) DEFAULT NULL COMMENT '站点名称',
`name` varchar(64) DEFAULT NULL COMMENT '姓名',
`number` varchar(64) DEFAULT NULL COMMENT '工号',
`userpost` varchar(64) DEFAULT NULL COMMENT '职务',
`posttitle` varchar(64) DEFAULT NULL COMMENT '职称',
CREATE TABLE mortals_sys_workman(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`loginName` varchar(64) COMMENT '登录用户名',
`loginPwd` varchar(255) COMMENT '密码',
`deptId` bigint(20) COMMENT '部门id号',
`deptName` varchar(64) COMMENT '部门名称',
`windowId` bigint(20) COMMENT '窗口id号',
`windowName` varchar(64) COMMENT '窗口名称',
`siteId` bigint(20) COMMENT '站点ID',
`siteName` varchar(255) COMMENT '站点名称',
`name` varchar(64) COMMENT '姓名',
`number` varchar(64) COMMENT '工号',
`userpost` varchar(64) COMMENT '职务',
`posttitle` varchar(64) COMMENT '职称',
`politicalstatus` tinyint(2) DEFAULT '0' COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
`dangyuan` tinyint(2) DEFAULT '0' COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
`dangyuanext` varchar(64) DEFAULT NULL COMMENT '党员扩展',
`phone` varchar(64) DEFAULT NULL COMMENT '电话',
`mobile` varchar(64) DEFAULT NULL COMMENT '手机',
`starlevel` tinyint(2) DEFAULT NULL COMMENT '星级',
`summary` varchar(255) DEFAULT NULL COMMENT '个人简介',
`photoPath` varchar(255) DEFAULT NULL COMMENT '照片',
`dangyuanext` varchar(64) COMMENT '党员扩展',
`idCard` varchar(32) COMMENT '身份证',
`phone` varchar(64) COMMENT '电话',
`mobile` varchar(64) COMMENT '手机',
`starlevel` tinyint(2) DEFAULT '0' COMMENT '星级',
`summary` varchar(255) COMMENT '个人简介',
`photoPath` varchar(255) COMMENT '照片',
`duty` mediumtext COMMENT '岗位职责',
`promise` mediumtext COMMENT '服务承诺',
`business` mediumtext COMMENT '办理事项',
`online` tinyint(2) DEFAULT '1' COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
`modelIds` varchar(256) DEFAULT '' COMMENT '配置站点模块，逗号分隔',
`createTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
`createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
`updateTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
`lastLoginTime` datetime DEFAULT NULL COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) DEFAULT NULL COMMENT '最后一次登录地址',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员表';
`modelIds` varchar(256) COMMENT '配置站点模块，逗号分隔',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员';
-- ----------------------------
-- 基础事项表
......
base-manager/doc/api.md
View file @ 4266f4c7
......@@ -5286,6 +5286,7 @@ data|object|数据对象|-
  politicalstatus|Integer|政治面貌 (0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)|-
  dangyuan|Integer|党员 (0.非党员，1.党员，2.党员示范岗，3.党员先锋岗，99.其它)|-
  dangyuanext|String|扩展信息|-
  idCard|String|身份证
  phone|String|电话|-
  mobile|String|手机|-
  modelIds|String|模块id,逗号分隔|-
......@@ -5365,6 +5366,7 @@ data|object|数据对象|-
 posttitle|String|职称|-
 politicalstatus|Integer|政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)|-
 dangyuan|Integer|党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)|-
 idCard|String|身份证
 phone|String|电话|-
 mobile|String|手机|-
 starlevel|Integer|星级|-
......@@ -5415,6 +5417,7 @@ userpost| String | 职务 | 是 |-
posttitle| String | 职称 | 是 |-
politicalstatus| Integer | 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它) | 是 |-
dangyuan| Integer | 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗，99.其它) | 是 |-
idCard|String|否|身份证
dangyuanext| String | 党员扩展 | 否 |-
phone| String | 电话 | 是 |-
mobile| String | 手机 | 是 |-
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java
View file @ 4266f4c7
......@@ -36,11 +36,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
@Autowired
private AppInfoFieldService appInfoFieldService;
@Autowired
private AppService appService;
@Autowired
private AppVersionService appVersionService;
@Override
protected void saveAfter(AppDatasetEntity entity, Context context) throws AppException {
......@@ -54,9 +49,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
appInfoFieldService.save(entity.getAppInfoFieldList());
}
//更新版本号
/* AppEntity appEntity = appService.get(entity.getAppId(), context);
saveOrUpdateAppVersion(appEntity, context);*/
super.saveAfter(entity, context);
}
......@@ -93,26 +85,4 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
public Result<AppInfoFieldEntity> findCustomList(AppDatasetQuery appDatasetQuery, PageInfo pageInfo, Context context) throws AppException {
return this.dao.getCustomList(appDatasetQuery, pageInfo);
}
/* private void saveOrUpdateAppVersion(AppEntity appEntity, Context context) {
if (!ObjectUtils.isEmpty(appEntity)) {
String version = appEntity.getVersion();
String versionNum = StrUtil.subAfter(version, Constant.VERSION_PREFIX, false);
String newVersionNum = NumberUtil.add(versionNum, "0.1").setScale(1).toString();
AppVersionEntity appVersionEntity = new AppVersionEntity();
appVersionEntity.initAttrValue();
AppVersionEntity versionEntity = new AppVersionEntity();
versionEntity.initAttrValue();
versionEntity.setAppId(appEntity.getId());
versionEntity.setVersion(Constant.VERSION_PREFIX + newVersionNum);
versionEntity.setNotes("应用数据更新！");
versionEntity.setFileName(appEntity.getFileName());
versionEntity.setDistributeFilePath(appVersionEntity.getDistributeFilePath());
versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity, context);
appEntity.setVersion(versionEntity.getVersion());
appService.update(appEntity, context);
}
}*/
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ 4266f4c7
......@@ -172,25 +172,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
if (!ObjectUtils.isEmpty(appInfoTempleteFieldCloneList)) {
appInfoTempleteFieldService.save(appInfoTempleteFieldCloneList, context);
}
}
//克隆版本历史
/* List<AppVersionEntity> appVersionEntities = appVersionService.find(new AppVersionQuery().appId(appEntity.getId()));
if (!ObjectUtils.isEmpty(appVersionEntities)) {
List<AppVersionEntity> appVersionCloneList = new ArrayList<>();
for (AppVersionEntity appVersionEntity : appVersionEntities) {
AppVersionEntity appVersionClone = new AppVersionEntity();
appVersionClone.initAttrValue();
BeanUtils.copyProperties(appVersionEntity, appVersionClone, BeanUtil.getNullPropertyNames(appVersionEntity));
appVersionClone.setAppId(appClone.getId());
appVersionCloneList.add(appVersionClone);
}
if (!ObjectUtils.isEmpty(appVersionCloneList)) {
appVersionService.save(appVersionCloneList, context);
}
}*/
}
}
}
......@@ -298,8 +280,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
//级联删除 appids 相关数据
//删除模板属性
List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) {
......@@ -324,69 +304,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
super.removeAfter(ids, context, result);
}
/* @Override
public int removeList(List<AppEntity> list, Context context) throws AppException {
return super.removeList(list, context);
}*/
public static void main(String[] args) {
AppEntity appEntity = new AppEntity();
appEntity.initAttrValue();
ArrayList<AppDatasetEntity> appDatasetEntities = new ArrayList<>();
AppDatasetEntity appDatasetEntity = new AppDatasetEntity();
appDatasetEntity.setAppId(0L);
appDatasetEntity.setId(1L);
appDatasetEntity.setCreateTime(new Date());
appDatasetEntity.setCreateUser("");
appDatasetEntity.setCreateUserName("");
appDatasetEntity.setGroupList(Lists.newArrayList());
appDatasetEntity.setCreateUserId(0L);
appDatasetEntity.setCreateUserDeptId(0L);
appDatasetEntity.setCreateUserDeptName("");
AppInfoFieldEntity appInfoFieldEntity = new AppInfoFieldEntity();
appInfoFieldEntity.setDatasetId(0L);
appInfoFieldEntity.setFieldCode("12313");
appInfoFieldEntity.setFieldName("1313");
appInfoFieldEntity.setFieldType("1");
appInfoFieldEntity.setDataType("1");
appInfoFieldEntity.setFieldValue("");
appInfoFieldEntity.setFieldLen(0);
appInfoFieldEntity.setFieldNull(0);
appInfoFieldEntity.setIsList(0);
appInfoFieldEntity.setFieldOrderNo(1);
appInfoFieldEntity.setRemark("");
appInfoFieldEntity.setId(0L);
appInfoFieldEntity.setColPickMode(0);
appInfoFieldEntity.setCreateTime(new Date());
appInfoFieldEntity.setCreateUser("");
appInfoFieldEntity.setCreateUserName("");
appInfoFieldEntity.setUpdateTime(new Date());
appInfoFieldEntity.setUpdateUser("");
appInfoFieldEntity.setUpdateUserName("");
ArrayList<AppInfoFieldEntity> appInfoFieldEntities = new ArrayList<>();
appInfoFieldEntities.add(appInfoFieldEntity);
appDatasetEntity.setAppInfoFieldList(appInfoFieldEntities);
appDatasetEntities.add(appDatasetEntity);
appEntity.setAppDatasetList(appDatasetEntities);
AppEntity appClone = new AppEntity();
BeanUtils.copyProperties(appEntity, appClone, BeanUtil.getNullPropertyNames(appEntity));
System.out.println(JSON.toJSONString(appClone));
System.out.println(NumberUtil.add("1.0", "0.1").setScale(1).toString());
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java
View file @ 4266f4c7
......@@ -86,9 +86,7 @@ public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao
AppVersionEntity model = new AppVersionEntity();
model.setUsed(YesNoEnum.NO.getValue());
AppVersionQuery condition = new AppVersionQuery().appId(appVersionEntity.getAppId());
this.getDao().update(model,condition);
this.update(appVersionEntity, context);
......
base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
View file @ 4266f4c7
package com.mortals.xhx.module.workman.model;
import com.alibaba.fastjson.JSON;
import com.mortals.xhx.common.utils.BeanUtil;
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.workman.model.vo.WorkmanVo;
import org.springframework.beans.BeanUtils;
/**
* 工作人员实体对象
*
* @author zxfei
* @date 2022-09-19
* @date 2022-12-23
*/
public class WorkmanEntity extends WorkmanVo {
private static final long serialVersionUID = 1L;
/**
* 登录用户名
*/
private String loginName;
/**
* 密码
*/
private String loginPwd;
/**
* 部门id号
*/
......@@ -63,6 +73,14 @@ public class WorkmanEntity extends WorkmanVo {
* 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
*/
private Integer dangyuan;
/**
* 党员扩展
*/
private String dangyuanext;
/**
* 身份证
*/
private String idCard;
/**
* 电话
*/
......@@ -100,21 +118,49 @@ public class WorkmanEntity extends WorkmanVo {
*/
private Integer online;
/**
* 用户登录名
* 配置站点模块，逗号分隔
*/
private String loginName;
private String modelIds;
/**
* 密码
* 最后一次登录时间
*/
private String loginPwd;
private Date lastLoginTime;
/**
* 党员扩展信息
* 最后一次登录地址
*/
private String dangyuanext;
private String lastLoginAddress;
public WorkmanEntity(){}
/**
* 获取 登录用户名
* @return String
*/
public String getLoginName(){
return loginName;
}
/**
* 设置 登录用户名
* @param loginName
*/
public void setLoginName(String loginName){
this.loginName = loginName;
}
/**
* 获取 密码
* @return String
*/
public String getLoginPwd(){
return loginPwd;
}
/**
* 设置 密码
* @param loginPwd
*/
public void setLoginPwd(String loginPwd){
this.loginPwd = loginPwd;
}
/**
* 获取 部门id号
* @return Long
......@@ -283,6 +329,34 @@ public class WorkmanEntity extends WorkmanVo {
public void setDangyuan(Integer dangyuan){
this.dangyuan = dangyuan;
}
/**
* 获取 党员扩展
* @return String
*/
public String getDangyuanext(){
return dangyuanext;
}
/**
* 设置 党员扩展
* @param dangyuanext
*/
public void setDangyuanext(String dangyuanext){
this.dangyuanext = dangyuanext;
}
/**
* 获取 身份证
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 电话
* @return String
......@@ -410,46 +484,46 @@ public class WorkmanEntity extends WorkmanVo {
this.online = online;
}
/**
* 获取 用户登录名
* 获取 配置站点模块，逗号分隔
* @return String
*/
public String getLoginName(){
return loginName;
public String getModelIds(){
return modelIds;
}
/**
* 设置 用户登录名
* @param loginName
* 设置 配置站点模块，逗号分隔
* @param modelIds
*/
public void setLoginName(String loginName){
this.loginName = loginName;
public void setModelIds(String modelIds){
this.modelIds = modelIds;
}
/**
* 获取 密码
* @return String
* 获取 最后一次登录时间
* @return Date
*/
public String getLoginPwd(){
return loginPwd;
public Date getLastLoginTime(){
return lastLoginTime;
}
/**
* 设置 密码
* @param loginPwd
* 设置 最后一次登录时间
* @param lastLoginTime
*/
public void setLoginPwd(String loginPwd){
this.loginPwd = loginPwd;
public void setLastLoginTime(Date lastLoginTime){
this.lastLoginTime = lastLoginTime;
}
/**
* 获取 党员扩展信息
* 获取 最后一次登录地址
* @return String
*/
public String getDangyuanext(){
return dangyuanext;
public String getLastLoginAddress(){
return lastLoginAddress;
}
/**
* 设置 党员扩展信息
* @param dangyuanext
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public void setDangyuanext(String dangyuanext){
this.dangyuanext = dangyuanext;
public void setLastLoginAddress(String lastLoginAddress){
this.lastLoginAddress = lastLoginAddress;
}
......@@ -473,6 +547,8 @@ public class WorkmanEntity extends WorkmanVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",loginName:").append(getLoginName());
sb.append(",loginPwd:").append(getLoginPwd());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",windowId:").append(getWindowId());
......@@ -485,6 +561,8 @@ public class WorkmanEntity extends WorkmanVo {
sb.append(",posttitle:").append(getPosttitle());
sb.append(",politicalstatus:").append(getPoliticalstatus());
sb.append(",dangyuan:").append(getDangyuan());
sb.append(",dangyuanext:").append(getDangyuanext());
sb.append(",idCard:").append(getIdCard());
sb.append(",phone:").append(getPhone());
sb.append(",mobile:").append(getMobile());
sb.append(",starlevel:").append(getStarlevel());
......@@ -494,23 +572,27 @@ public class WorkmanEntity extends WorkmanVo {
sb.append(",promise:").append(getPromise());
sb.append(",business:").append(getBusiness());
sb.append(",online:").append(getOnline());
sb.append(",loginName:").append(getLoginName());
sb.append(",loginPwd:").append(getLoginPwd());
sb.append(",dangyuanext:").append(getDangyuanext());
sb.append(",modelIds:").append(getModelIds());
sb.append(",lastLoginTime:").append(getLastLoginTime());
sb.append(",lastLoginAddress:").append(getLastLoginAddress());
return sb.toString();
}
public void initAttrValue(){
this.deptId = 0L;
this.loginName = "";
this.loginPwd = "";
this.deptId = null;
this.deptName = "";
this.windowId = 0L;
this.windowId = null;
this.windowName = "";
this.siteId = 0L;
this.siteId = null;
this.siteName = "";
......@@ -526,6 +608,10 @@ public class WorkmanEntity extends WorkmanVo {
this.dangyuan = 0;
this.dangyuanext = "";
this.idCard = "";
this.phone = "";
this.mobile = "";
......@@ -536,34 +622,18 @@ public class WorkmanEntity extends WorkmanVo {
this.photoPath = "";
this.duty = "";
this.duty = null;
this.promise = "";
this.promise = null;
this.business = "";
this.business = null;
this.online = 1;
this.loginName = "";
this.loginPwd = "";
this.dangyuanext = "";
}
public static void main(String[] args) {
WorkmanEntity source = new WorkmanEntity();
source.setLoginName("admin");
source.setLoginPwd("123456");
WorkmanEntity workmanEntity = new WorkmanEntity();
workmanEntity.initAttrValue();
this.modelIds = "";
//BeanUtils.copyProperties(source,workmanEntity, BeanUtil.getNullPropertyNames(source));
BeanUtils.copyProperties(workmanEntity,source, BeanUtil.getNullPropertyNames(workmanEntity));
this.lastLoginTime = null;
System.out.println(JSON.toJSONString(source));
this.lastLoginAddress = null;
}
}
\ No newline at end of file
base-manager/src/main/resources/logback-spring.xml
View file @ 4266f4c7
......@@ -62,13 +62,12 @@
<appender-ref ref="fileError"/>
</logger>
<logger name="com.mortals.xhx.module" level="info" additivity="false">
<logger name="com.mortals.xhx.module" level="debug" additivity="false">
<appender-ref ref="console"/>
<appender-ref ref="fileInfo"/>
<appender-ref ref="fileError"/>
</logger>
<!-- <logger name="com.mortals.xhx.module">
<level value="debug"/>
</logger>-->
......
base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http
View file @ 4266f4c7
......@@ -19,7 +19,9 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"appId":1,
"appId":20,
"fieldName": "标题",
"fieldValue": "管理办法",
"page":1,
"size":10
}
......
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