Browse Source

tdsql版,remark字段改为 note 字段

master_tdsql
wuxu 1 month ago
parent
commit
0f887098e4
  1. 2
      shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
  2. 6
      shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java
  3. 13
      shuili-admin/src/main/java/com/slsoft/App.java
  4. 2
      shuili-admin/src/main/resources/application-druid-test.yml
  5. 6
      shuili-admin/src/main/resources/config/application-druid-dev.yml
  6. 4
      shuili-common/src/main/java/com/shuili/common/constant/GenConstants.java
  7. 14
      shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java
  8. 2
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictData.java
  9. 2
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictType.java
  10. 2
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java
  11. 2
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java
  12. 13
      shuili-framework/src/main/java/com/slsoft/App.java
  13. 13
      shuili-generator/src/main/java/com/slsoft/App.java
  14. 14
      shuili-generator/src/main/resources/mapper/generator/GenTableMapper.xml
  15. 2
      shuili-system/src/main/java/com/kms/common/utils/DataTypeUtil.java
  16. 2
      shuili-system/src/main/java/com/kms/system/domain/SysConfig.java
  17. 2
      shuili-system/src/main/java/com/kms/system/domain/SysNotice.java
  18. 2
      shuili-system/src/main/java/com/kms/system/domain/SysPost.java
  19. 2
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  20. 2
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
  21. 4
      shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java
  22. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  23. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
  24. 2
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java
  25. 2
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
  26. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java
  27. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java
  28. 6
      shuili-system/src/main/resources/mapper/system/SysDictDataMapper.xml
  29. 6
      shuili-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
  30. 8
      shuili-system/src/main/resources/mapper/system/SysMenuMapper.xml
  31. 10
      shuili-system/src/main/resources/mapper/system/SysPostMapper.xml
  32. 10
      shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml
  33. 12
      shuili-system/src/main/resources/mapper/system/SysUserMapper.xml
  34. 12
      shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml
  35. 4
      shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml
  36. 2
      shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml
  37. 2
      shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml

2
shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java

@ -72,7 +72,7 @@ public class CmsCallBackController {
user.preInsert();
user.setCreateUid("1");
user.setUpdateUid("1");
user.setRemark("门户定时任务数据添加");
user.setNote("门户定时任务数据添加");
user.setId(IdUtils.fastSimpleUUID());
user.setIsPcUser("0");
user.setDelFlag("0");

6
shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java

@ -66,7 +66,7 @@ public class WaterScheduled {
user.preInsert();
user.setCreateUid("1");
user.setUpdateUid("1");
user.setRemark("门户定时任务数据添加");
user.setNote("门户定时任务数据添加");
user.setId(IdUtils.fastSimpleUUID());
user.setIsPcUser("0");
user.setDelFlag("0");
@ -133,7 +133,7 @@ public class WaterScheduled {
dept = new SysDept();
dept.setCreateUid("1");
dept.setUpdateUid("1");
dept.setRemark("门户定时任务数据添加");
dept.setNote("门户定时任务数据添加");
dept.setIsDownload("0");
dept.setIsComment("0");
dept.setDelFlag("0");
@ -199,7 +199,7 @@ public class WaterScheduled {
sysRole.setRoleSort("0");
sysRole.setCreateUid("1");
sysRole.setUpdateUid("1");
sysRole.setRemark("门户定时任务数据添加");
sysRole.setNote("门户定时任务数据添加");
sysRole.setMd5(MD5Util.MD5Encode(singleRole.toString(), "utf-8"));
BeanUtils.copyProperties(singleRole,sysRole);
sysRole.setRoleName(singleRole.getName());

13
shuili-admin/src/main/java/com/slsoft/App.java

@ -1,13 +0,0 @@
package com.slsoft;
/**
* Hello world!
*
*/
public class App
{
public static void main( String[] args )
{
System.out.println( "Hello World!" );
}
}

2
shuili-admin/src/main/resources/application-druid-test.yml

@ -7,7 +7,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://47.93.254.187:3306/sgc_yg_tdsql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: shuili
password: wuxukgdvJ1!@!
# 从库数据源

6
shuili-admin/src/main/resources/config/application-druid-dev.yml

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: mysql123456
url: jdbc:mysql://47.93.254.187:3306/sgc_yg_tdsql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: shuili
password: wuxukgdvJ1!@!
# 从库数据源
slave:
# 从数据源开关/默认关闭

4
shuili-common/src/main/java/com/shuili/common/constant/GenConstants.java

@ -48,10 +48,10 @@ public class GenConstants
/** 页面不需要查询字段 */
public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
"update_time", "remark" };
"update_time", "note" };
/** Entity基类字段 */
public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "note" };
/** Tree基类字段 */
public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };

14
shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java

@ -53,7 +53,9 @@ public class BaseEntity implements Serializable
@TableField(exist = false)
/** 备注 */
@Excel(name = "备注,可以不填")
protected String remark;
protected String note;
/** 开始时间 */
@JsonIgnore
@ -179,14 +181,12 @@ public class BaseEntity implements Serializable
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
public String getNote() {
return note;
}
public void setRemark(String remark)
{
this.remark = remark;
public void setNote(String note) {
this.note = note;
}
public String getBeginTime()

2
shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictData.java

@ -166,7 +166,7 @@ public class SysDictData extends BaseEntity
.append("createTime", getCreateTime())
.append("updateUid", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

2
shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictType.java

@ -77,7 +77,7 @@ public class SysDictType extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

2
shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java

@ -229,7 +229,7 @@ public class SysMenu extends BaseEntity {
.append("createTime", getCreateTime())
.append("updateBy", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

2
shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java

@ -195,7 +195,7 @@ public class SysRole extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

13
shuili-framework/src/main/java/com/slsoft/App.java

@ -1,13 +0,0 @@
package com.slsoft;
/**
* Hello world!
*
*/
public class App
{
public static void main( String[] args )
{
System.out.println( "Hello World!" );
}
}

13
shuili-generator/src/main/java/com/slsoft/App.java

@ -1,13 +0,0 @@
package com.slsoft;
/**
* Hello world!
*
*/
public class App
{
public static void main( String[] args )
{
System.out.println( "Hello World!" );
}
}

14
shuili-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateUid" column="update_uid" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="note" column="note" />
<collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
</resultMap>
@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectGenTableVo">
select id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_uid, create_time, update_uid, update_time, remark
select id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_uid, create_time, update_uid, update_time, note
from gen_table
</sql>
@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectGenTableById" parameterType="String" resultMap="GenTableResult">
SELECT t.id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
SELECT t.id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.note,
c.id AS cid, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t
LEFT JOIN gen_table_column c ON t.id = c.table_id
@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
SELECT t.id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
SELECT t.id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.note,
c.id as cid, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t
LEFT JOIN gen_table_column c ON t.id = c.table_id
@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
<if test="genType != null and genType != ''">gen_type,</if>
<if test="genPath != null and genPath != ''">gen_path,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="note != null and note != ''">note,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
create_time
)values(
@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
<if test="genType != null and genType != ''">#{genType},</if>
<if test="genPath != null and genPath != ''">#{genPath},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="note != null and note != ''">#{note},</if>
<if test="createUid != null and createUid != ''">#{createUid},</if>
sysdate()
)
@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
<if test="options != null and options != ''">options = #{options},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="note != null">note = #{note},</if>
update_time = sysdate()
</set>
where id = #{id}

2
shuili-system/src/main/java/com/kms/common/utils/DataTypeUtil.java

@ -33,7 +33,7 @@ public class DataTypeUtil {
fileName = fileName.substring(fileName.lastIndexOf(".") + 1);
for (int i = 0; i < dictList.size(); i++) {
SysDictData dict = dictList.get(i);
String description = dict.getRemark();
String description = dict.getNote();
if (description.contains(fileName)) {
contentType = dict.getDictValue();
break;

2
shuili-system/src/main/java/com/kms/system/domain/SysConfig.java

@ -94,7 +94,7 @@ public class SysConfig extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

2
shuili-system/src/main/java/com/kms/system/domain/SysNotice.java

@ -91,7 +91,7 @@ public class SysNotice extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

2
shuili-system/src/main/java/com/kms/system/domain/SysPost.java

@ -122,7 +122,7 @@ public class SysPost extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateUid())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("remark", getNote())
.toString();
}
}

2
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@ -266,7 +266,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
bsSgcDfSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId());
BsSgcDfSafeJbxx bsSgcDfSafeJbxx = list.get(0);
bsSgcDfSafeJbxx.setStatus("5");
bsSgcDfSafeJbxx.setRemark(bsSgcSzSafeJbxx.getRemark());
bsSgcDfSafeJbxx.setNote(bsSgcSzSafeJbxx.getNote());
bsSgcDfSafeJbxx.setExprDate(null);
return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcDfSafeJbxx));
}

2
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java

@ -54,7 +54,7 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
szrwDto.setDikeType(bsSgcSzSafeJbxx.getDikeType());
szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
szrwDto.setStatus(record.getStatus());
szrwDto.setRemark(record.getRemark());
szrwDto.setRemark(record.getNote());
szrwDto.setPlanTime(record.getPlanTime());
szrwDto.setCompletionTime(record.getCompletionTime());

4
shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java

@ -102,7 +102,7 @@ public class BsSgcResFxzzController extends BaseController
AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class)
.eq(AttResBase::getResCode, dikeCode));
byId.setRemark("4");
byId.setNote("4");
bsSgcSzSafeJbxxService.updateById(byId);
BsSgcResFxzz bsSgcSzFxzz = new BsSgcResFxzz();
BeanUtils.copyProperties(dto,bsSgcSzFxzz);
@ -130,7 +130,7 @@ public class BsSgcResFxzzController extends BaseController
String dikeCode = bsSgcSzFxzz.getResCode();
AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class)
.eq(AttResBase::getResCode, dikeCode));
byId.setRemark("4");
byId.setNote("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzFxzzService.updateById(bsSgcSzFxzz));
}

2
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@ -257,7 +257,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
BsSgcSzSafeJbxx bsSgcDfSafeJbxx = list.get(0);
bsSgcDfSafeJbxx.setExprDate(null);
bsSgcDfSafeJbxx.setStatus("5");
bsSgcDfSafeJbxx.setRemark(bsSgcSzSafeJbxx.getRemark());
bsSgcDfSafeJbxx.setNote(bsSgcSzSafeJbxx.getNote());
return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx));
}
return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx));

2
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java

@ -53,7 +53,7 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
szrwDto.setStatus(record.getStatus());
szrwDto.setRemark(record.getRemark());
szrwDto.setRemark(record.getNote());
szrwDto.setPlanTime(record.getPlanTime());
szrwDto.setCompletionTime(record.getCompletionTime());

2
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java

@ -60,7 +60,7 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
dto.setKey(dict.getDictValue());
dto.setValue(dict.getDictLabel());
dto.setSort(dict.getDictSort());
dto.setRemark(dict.getRemark());
dto.setRemark(dict.getNote());
dto.setChildren(getByDictTypeStream(dict.getDictValue()).map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()));
return dto;
}

2
shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java

@ -120,7 +120,7 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
// 4. 修改任务状态
task.setState(dto.getState());
task.setRemark(dto.getRemark());
task.setNote(dto.getRemark());
if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
task.setFinishTime(new Date());
}

2
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java

@ -61,7 +61,7 @@ public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>
dto.setKey(dict.getDictValue());
dto.setValue(dict.getDictLabel());
dto.setSort(dict.getDictSort());
dto.setRemark(dict.getRemark());
dto.setRemark(dict.getNote());
dto.setChildren(getByDictTypeStream(dict.getDictValue()).map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()));
return dto;
}

2
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java

@ -122,7 +122,7 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
// 4. 修改任务状态
task.setState(dto.getState());
task.setRemark(dto.getRemark());
task.setNote(dto.getRemark());
if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
task.setFinishTime(new Date());
}

6
shuili-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="listClass != null">list_class = #{listClass},</if>
<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
<if test="status != null">status = #{status},</if>
<!-- <if test="remark != null">remark = #{remark},</if>-->
<!-- <if test="note != null">note = #{note},</if>-->
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
update_time = sysdate()
</set>
@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="listClass != null and listClass != ''">list_class,</if>
<if test="isDefault != null and isDefault != ''">is_default,</if>
<if test="status != null">status,</if>
<!-- <if test="remark != null and remark != ''">remark,</if>-->
<!-- <if test="note != null and note != ''">note,</if>-->
<if test="createUid != null and createUid != ''">create_uid,</if>
create_time,
update_time
@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="listClass != null and listClass != ''">#{listClass},</if>
<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
<if test="status != null">#{status},</if>
<!-- <if test="remark != null and remark != ''">#{remark},</if>-->
<!-- <if test="note != null and note != ''">#{note},</if>-->
<if test="createUid != null and createUid != ''">#{createUid},</if>
sysdate(),
sysdate()

6
shuili-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
<if test="status != null">status = #{status},</if>
<!-- <if test="remark != null">remark = #{remark},</if>-->
<!-- <if test="note != null">note = #{note},</if>-->
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
update_time = sysdate()
</set>
@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
<if test="status != null">status,</if>
<!-- <if test="remark != null and remark != ''">remark,</if>-->
<!-- <if test="note != null and note != ''">note,</if>-->
<if test="createUid != null and createUid != ''">create_uid,</if>
create_time
)values(
@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dictName != null and dictName != ''">#{dictName},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
<if test="status != null">#{status},</if>
<!-- <if test="remark != null and remark != ''">#{remark},</if>-->
<!-- <if test="note != null and note != ''">#{note},</if>-->
<if test="createUid != null and createUid != ''">#{createUid},</if>
sysdate()
)

8
shuili-system/src/main/resources/mapper/system/SysMenuMapper.xml

@ -22,7 +22,7 @@
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="updateUid" column="update_uid" />
<result property="remark" column="remark" />
<result property="note" column="note" />
</resultMap>
<sql id="selectMenuVo">
@ -134,7 +134,7 @@
<if test="status != null">status = #{status},</if>
<if test="perms !=null">perms = #{perms},</if>
<if test="icon !=null and icon != ''">icon = #{icon},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="note != null and note != ''">note = #{note},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
update_time = sysdate()
</set>
@ -155,7 +155,7 @@
<if test="status != null">status,</if>
<if test="perms !=null and perms != ''">perms,</if>
<if test="icon != null and icon != ''">icon,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="note != null and note != ''">note,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
create_time,
update_time
@ -172,7 +172,7 @@
<if test="status != null">#{status},</if>
<if test="perms !=null and perms != ''">#{perms},</if>
<if test="icon != null and icon != ''">#{icon},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="note != null and note != ''">#{note},</if>
<if test="createUid != null and createUid != ''">#{createUid},</if>
sysdate(),
sysdate()

10
shuili-system/src/main/resources/mapper/system/SysPostMapper.xml

@ -14,11 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateUid" column="update_uid" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="note" column="note" />
</resultMap>
<sql id="selectPostVo">
select id, post_code, post_name, post_sort, status, create_uid, create_time, remark
select id, post_code, post_name, post_sort, status, create_uid, create_time, note
from sys_post
</sql>
@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="postName != null and postName != ''">post_name = #{postName},</if>
<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="note != null">note = #{note},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
update_time = sysdate()
</set>
@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="postName != null and postName != ''">post_name,</if>
<if test="postSort != null and postSort != ''">post_sort,</if>
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="note != null and note != ''">note,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
create_time
)values(
@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="postName != null and postName != ''">#{postName},</if>
<if test="postSort != null and postSort != ''">#{postSort},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="note != null and note != ''">#{note},</if>
<if test="createUid != null and createUid != ''">#{createUid},</if>
sysdate()
)

10
shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml

@ -16,12 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateUid" column="update_uid" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="note" column="note" />
</resultMap>
<sql id="selectRoleVo">
select distinct r.id, r.role_name, r.role_key, r.role_sort, r.data_scope,
r.status, r.del_flag, r.create_time, r.remark
r.status, r.del_flag, r.create_time, r.note
from sys_role r
left join sys_user_role ur on ur.role_id = r.id
left join sys_user u on u.id = ur.user_id
@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleSort != null and roleSort != ''">role_sort,</if>
<if test="dataScope != null and dataScope != ''">data_scope,</if>
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="note != null and note != ''">note,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
create_time
)values(
@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleSort != null and roleSort != ''">#{roleSort},</if>
<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="note != null and note != ''">#{note},</if>
<if test="createUid != null and createUid != ''">#{createUid},</if>
sysdate()
)
@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="note != null">note = #{note},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
update_time = sysdate()
</set>

12
shuili-system/src/main/resources/mapper/system/SysUserMapper.xml

@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateUid" column="update_uid" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="note" column="note" />
<result property="realName" column="real_name" />
<result property="cardNo" column="card_no" />
<result property="department" column="department" />
@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectUserVo">
select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark,
select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.note,
u.real_name,u.card_no,u.department,u.post,u.professional,
d.id,d.xzqh_id,d.parent_id,d.tag as dtag, d.dept_name as ddept_name, d.order_num as dorder_num, d.leader as dleader, d.status as dept_status, d.pc_logo, d.pc_background, d.admin_logo,
r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectUserList" parameterType="com.shuili.common.core.domain.entity.SysUser" resultMap="sysUserResult">
select u.id,u.is_pc_user,u.invitee,u.is_first, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark,
select u.id,u.is_pc_user,u.invitee,u.is_first, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.note,
d.dept_name as ddept_name,d.tag as dtag, d.id as did,d.parent_id as dparent_id,
u.real_name,u.card_no,u.department,u.post,u.professional,d.leader,d.is_download,d.is_comment,
d.ip_start,d.ip_end, d.pc_logo, d.pc_background, d.admin_logo
@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginDate != null">login_date,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
<if test="updateUid != null and updateUid != ''">update_uid,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="note != null and note != ''">note,</if>
<if test="realName != null">real_name,</if>
<if test="cardNo != null">card_no,</if>
<if test="department != null">department,</if>
@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginIp != null and loginIp != ''">#{loginIp},</if>
<if test="loginDate != null">#{loginDate},</if>
<if test="updateUid != null and updateUid != ''">#{updateUid},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="note != null and note != ''">#{note},</if>
<if test="realName != null">
#{realName},
</if>
@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="note != null">note = #{note},</if>
<if test="isFirst != null">is_first = #{isFirst},</if>
<if test="realName != null">
real_name = #{realName},</if>

12
shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml

@ -21,7 +21,7 @@
<result property="tileMatrixSet" column="tile_matrix_set" jdbcType="VARCHAR"/>
<result property="dirId" column="dir_id" jdbcType="VARCHAR"/>
<result property="dirName" column="dir_name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="note" column="note" jdbcType="VARCHAR"/>
<result property="format" column="format" jdbcType="VARCHAR"/>
<result property="data" column="data" jdbcType="VARCHAR"/>
<result property="tileSetOption" column="tileset_option" jdbcType="VARCHAR"/>
@ -40,7 +40,7 @@
service_url,annotation_url,service_token,
service_type,service_index,annotation_service_index,pub_date,
create_user,layer_3d_type,tile_size,
tile_matrix_set,dir_id,dir_name,remark,format,data,tileset_option,is_layer_group,
tile_matrix_set,dir_id,dir_name,note,format,data,tileset_option,is_layer_group,
relation_service_id,relation_service_name,relation_style_id,relation_style_name,extend_data,is_need_cluster
</sql>
@ -53,7 +53,7 @@
service_url,annotation_url,service_token,service_type,service_index,annotation_service_index,
pub_date,
create_user,layer_3d_type,tile_size,
tile_matrix_set,dir_id,dir_name,remark,format,data,tileset_option,is_layer_group,
tile_matrix_set,dir_id,dir_name,note,format,data,tileset_option,is_layer_group,
relation_service_id,relation_service_name,relation_style_id,relation_style_name,extend_data,is_need_cluster
</sql>
@ -76,7 +76,7 @@
<if test="tileMatrixSet != null">tile_matrix_set,</if>
<if test="dirId != null">dir_id,</if>
<if test="dirName != null">dir_name,</if>
<if test="remark != null">remark,</if>
<if test="note != null">note,</if>
<if test="format != null">format,</if>
<if test="data != null">data,</if>
<if test="tileSetOption != null">tileset_option,</if>
@ -107,7 +107,7 @@
<if test="tileMatrixSet != null">#{tileMatrixSet,jdbcType=VARCHAR},</if>
<if test="dirId != null">#{dirId,jdbcType=VARCHAR},</if>
<if test="dirName != null">#{dirName,jdbcType=VARCHAR},</if>
<if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
<if test="note != null">#{note,jdbcType=VARCHAR},</if>
<if test="format != null">#{format,jdbcType=VARCHAR},</if>
<if test="data != null">#{data,jdbcType=VARCHAR},</if>
<if test="tileSetOption != null">#{tileSetOption,jdbcType=VARCHAR},</if>
@ -142,7 +142,7 @@
<if test="tileMatrixSet != null">tile_matrix_set=#{tileMatrixSet,jdbcType=VARCHAR},</if>
<if test="dirId != null">dir_id=#{dirId,jdbcType=VARCHAR},</if>
<if test="dirName != null">dir_name=#{dirName,jdbcType=VARCHAR},</if>
<if test="remark != null">remark=#{remark,jdbcType=VARCHAR},</if>
<if test="note != null">note=#{note,jdbcType=VARCHAR},</if>
<if test="format != null">format=#{format,jdbcType=VARCHAR},</if>
<if test="data != null">data=#{data,jdbcType=VARCHAR},</if>
<if test="tileSetOption != null">tileset_option=#{tileSetOption,jdbcType=VARCHAR},</if>

4
shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml

@ -9,7 +9,7 @@
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="layerType" column="layer_type" jdbcType="VARCHAR"/>
<result property="information" column="information" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="note" column="note" jdbcType="VARCHAR"/>
<result property="styleType" column="style_type" jdbcType="VARCHAR"/>
<result property="viewImg" column="view_img" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@ -19,7 +19,7 @@
<sql id="Base_Column_List">
id
,name,layer_type,
information,remark,style_type,
information,note,style_type,
view_img,create_time,modify_time
</sql>
<select id="findSyLayerList" resultType="com.kms.yg.znjg.domain.SyLayerStyle">

2
shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml

@ -27,7 +27,7 @@
typeHandler="com.kms.yxgh.common.mapper.handler.OperatorHandler"/>
<result property="type" column="type"/>
<result property="status" column="status"/>
<result property="remark" column="remark"/>
<result property="note" column="note"/>
</association>
</resultMap>

2
shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml

@ -27,7 +27,7 @@
typeHandler="com.kms.yxgh.common.mapper.handler.OperatorHandler"/>
<result property="type" column="type"/>
<result property="status" column="status"/>
<result property="remark" column="remark"/>
<result property="note" column="note"/>
</association>
</resultMap>

Loading…
Cancel
Save