Compare commits

...

4 Commits

Author SHA1 Message Date
review512jwy@163.com b7d07f652e 作业内容sql 3 weeks ago
review512jwy@163.com 3225f056b9 salesforce增加别名字段 3 weeks ago
review512jwy@163.com 196b26a746 salesforce增加别名字段 3 weeks ago
review512jwy@163.com bd0d508a92 对应状况级联sql 3 weeks ago
  1. 16
      data-center-business-controller/src/main/resources/db/migration/V100__work_content.sql
  2. 48
      data-center-business-controller/src/main/resources/db/migration/V98__dashboard_corresponding_situation.sql
  3. 1
      data-center-business-controller/src/main/resources/db/migration/V99__salesforce_alias.sql
  4. 29
      data-center-business-dao/src/main/resources/mappers/auto/BasicAssetClassBigMapper.xml
  5. 29
      data-center-business-dao/src/main/resources/mappers/auto/BasicSalesforceMapper.xml
  6. 7
      data-center-business-dao/src/main/resources/mappers/ex/BasicSalesforceMapperExt.xml
  7. 2
      data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/salesforce/OptSalesforceParams.java
  8. 3
      data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/salesforce/SalesforceSearchParams.java
  9. 34
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicAssetClassBig.java
  10. 34
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicSalesforce.java
  11. 70
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicSalesforceExample.java
  12. 4
      data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/salesforce/SalesforcePageVO.java
  13. 3
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/SalesforceServiceImpl.java

16
data-center-business-controller/src/main/resources/db/migration/V100__work_content.sql

@ -0,0 +1,16 @@
CREATE TABLE `dashboard_work_content` (
`id` bigint NOT NULL AUTO_INCREMENT,
`content` varchar(255) NOT NULL COMMENT '内容',
`sort_order` int DEFAULT 0 COMMENT '同级排序',
`created_at` bigint DEFAULT NULL,
`flag` int DEFAULT 0 COMMENT '0-正常,1-删除',
PRIMARY KEY (`id`)
) ENGINE=InnoDB COMMENT='作业内容';
INSERT INTO `dashboard_work_content` (`content`, `sort_order`, `created_at`, `flag`) VALUES
('受電設備点検(停電含む)', 0, UNIX_TIMESTAMP() * 1000, 0),
('消防設備点検', 1, UNIX_TIMESTAMP() * 1000, 0),
('消防訓練', 2, UNIX_TIMESTAMP() * 1000, 0),
('貯水槽清掃', 3, UNIX_TIMESTAMP() * 1000, 0),
('防火設備定期検査', 4, UNIX_TIMESTAMP() * 1000, 0);

48
data-center-business-controller/src/main/resources/db/migration/V98__dashboard_corresponding_situation.sql

@ -0,0 +1,48 @@
-- 建表
CREATE TABLE `dashboard_corresponding_situation` (
`id` bigint NOT NULL AUTO_INCREMENT,
`parent_id` bigint NOT NULL DEFAULT -1 COMMENT '父节点ID,-1表示一级分类',
`value` varchar(255) NOT NULL COMMENT '节点值',
`sort_order` int DEFAULT 0 COMMENT '同级排序',
`created_at` bigint DEFAULT NULL,
`flag` int DEFAULT 0 COMMENT '0-正常,1-删除',
PRIMARY KEY (`id`),
INDEX `idx_parent_id` (`parent_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='告警对应情况级联配置';
-- 一级分类
INSERT INTO dashboard_corresponding_situation (parent_id, value, sort_order, created_at)
VALUES
(-1, '防盗', 0, UNIX_TIMESTAMP() * 1000),
(-1, '设备', 1, UNIX_TIMESTAMP() * 1000),
(-1, '火警', 2, UNIX_TIMESTAMP() * 1000),
(-1, '冷冻', 3, UNIX_TIMESTAMP() * 1000),
(-1, '其他', 4, UNIX_TIMESTAMP() * 1000);
-- 二级分类(衍生物表绕过 MySQL 1093 限制)
INSERT INTO dashboard_corresponding_situation (parent_id, value, sort_order, created_at)
VALUES
-- 防盗
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '防盗' AND parent_id = -1) AS t), 'セットミス', 0, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '防盗' AND parent_id = -1) AS t), '施錠忘れ', 1, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '防盗' AND parent_id = -1) AS t), '従業員誤進入', 2, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '防盗' AND parent_id = -1) AS t), '清掃/従業員誤進入', 3, UNIX_TIMESTAMP() * 1000),
-- 设备
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '设备' AND parent_id = -1) AS t), '漏電警報', 0, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '设备' AND parent_id = -1) AS t), '満水警報', 1, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '设备' AND parent_id = -1) AS t), '缺水警報', 2, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '设备' AND parent_id = -1) AS t), 'デマンド警報', 3, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '设备' AND parent_id = -1) AS t), '空調機異常', 4, UNIX_TIMESTAMP() * 1000),
-- 火警
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '火警' AND parent_id = -1) AS t), '現場確認中', 0, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '火警' AND parent_id = -1) AS t), '感知器誤報', 1, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '火警' AND parent_id = -1) AS t), '防火扉開放', 2, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '火警' AND parent_id = -1) AS t), '火災感知器警報', 3, UNIX_TIMESTAMP() * 1000),
-- 冷冻
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '冷冻' AND parent_id = -1) AS t), '除霜復旧待ち', 0, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '冷冻' AND parent_id = -1) AS t), '高温異常', 1, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '冷冻' AND parent_id = -1) AS t), '高圧異常', 2, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '冷冻' AND parent_id = -1) AS t), '冷凍機故障', 3, UNIX_TIMESTAMP() * 1000),
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '冷冻' AND parent_id = -1) AS t), '扉開放による温度異常', 4, UNIX_TIMESTAMP() * 1000),
-- 其他
((SELECT id FROM (SELECT id FROM dashboard_corresponding_situation WHERE value = '其他' AND parent_id = -1) AS t), '○○異常', 0, UNIX_TIMESTAMP() * 1000);

1
data-center-business-controller/src/main/resources/db/migration/V99__salesforce_alias.sql

@ -0,0 +1 @@
ALTER TABLE basic_salesforce ADD `alias` varchar(255) DEFAULT NULL COMMENT '别名' after `building_id`;

29
data-center-business-dao/src/main/resources/mappers/auto/BasicAssetClassBigMapper.xml

@ -21,6 +21,7 @@
<result column="thumbnail_normal_base64" jdbcType="LONGVARCHAR" property="thumbnailNormalBase64" /> <result column="thumbnail_normal_base64" jdbcType="LONGVARCHAR" property="thumbnailNormalBase64" />
<result column="thumbnail_alarm_base64" jdbcType="LONGVARCHAR" property="thumbnailAlarmBase64" /> <result column="thumbnail_alarm_base64" jdbcType="LONGVARCHAR" property="thumbnailAlarmBase64" />
<result column="thumbnail_dis_base64" jdbcType="LONGVARCHAR" property="thumbnailDisBase64" /> <result column="thumbnail_dis_base64" jdbcType="LONGVARCHAR" property="thumbnailDisBase64" />
<result column="thumbnail_sys_alarm_base64" jdbcType="LONGVARCHAR" property="thumbnailSysAlarmBase64" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
@ -100,7 +101,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
thumbnail_normal_base64, thumbnail_alarm_base64, thumbnail_dis_base64 thumbnail_normal_base64, thumbnail_alarm_base64, thumbnail_dis_base64, thumbnail_sys_alarm_base64
</sql> </sql>
<select id="selectByExampleWithBLOBs" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBigExample" resultMap="ResultMapWithBLOBs"> <select id="selectByExampleWithBLOBs" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBigExample" resultMap="ResultMapWithBLOBs">
<!-- <!--
@ -182,12 +183,12 @@
</selectKey> </selectKey>
insert into basic_asset_class_big (company_id, class_name, create_time, insert into basic_asset_class_big (company_id, class_name, create_time,
flag, `type`, thumbnail_normal_base64, flag, `type`, thumbnail_normal_base64,
thumbnail_alarm_base64, thumbnail_dis_base64 thumbnail_alarm_base64, thumbnail_dis_base64,
) thumbnail_sys_alarm_base64)
values (#{companyId,jdbcType=BIGINT}, #{className,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, values (#{companyId,jdbcType=BIGINT}, #{className,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT},
#{flag,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{thumbnailNormalBase64,jdbcType=LONGVARCHAR}, #{flag,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{thumbnailNormalBase64,jdbcType=LONGVARCHAR},
#{thumbnailAlarmBase64,jdbcType=LONGVARCHAR}, #{thumbnailDisBase64,jdbcType=LONGVARCHAR} #{thumbnailAlarmBase64,jdbcType=LONGVARCHAR}, #{thumbnailDisBase64,jdbcType=LONGVARCHAR},
) #{thumbnailSysAlarmBase64,jdbcType=LONGVARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBig"> <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBig">
<!-- <!--
@ -223,6 +224,9 @@
<if test="thumbnailDisBase64 != null"> <if test="thumbnailDisBase64 != null">
thumbnail_dis_base64, thumbnail_dis_base64,
</if> </if>
<if test="thumbnailSysAlarmBase64 != null">
thumbnail_sys_alarm_base64,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="companyId != null"> <if test="companyId != null">
@ -249,6 +253,9 @@
<if test="thumbnailDisBase64 != null"> <if test="thumbnailDisBase64 != null">
#{thumbnailDisBase64,jdbcType=LONGVARCHAR}, #{thumbnailDisBase64,jdbcType=LONGVARCHAR},
</if> </if>
<if test="thumbnailSysAlarmBase64 != null">
#{thumbnailSysAlarmBase64,jdbcType=LONGVARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBigExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBigExample" resultType="java.lang.Long">
@ -295,6 +302,9 @@
<if test="record.thumbnailDisBase64 != null"> <if test="record.thumbnailDisBase64 != null">
thumbnail_dis_base64 = #{record.thumbnailDisBase64,jdbcType=LONGVARCHAR}, thumbnail_dis_base64 = #{record.thumbnailDisBase64,jdbcType=LONGVARCHAR},
</if> </if>
<if test="record.thumbnailSysAlarmBase64 != null">
thumbnail_sys_alarm_base64 = #{record.thumbnailSysAlarmBase64,jdbcType=LONGVARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -314,7 +324,8 @@
`type` = #{record.type,jdbcType=INTEGER}, `type` = #{record.type,jdbcType=INTEGER},
thumbnail_normal_base64 = #{record.thumbnailNormalBase64,jdbcType=LONGVARCHAR}, thumbnail_normal_base64 = #{record.thumbnailNormalBase64,jdbcType=LONGVARCHAR},
thumbnail_alarm_base64 = #{record.thumbnailAlarmBase64,jdbcType=LONGVARCHAR}, thumbnail_alarm_base64 = #{record.thumbnailAlarmBase64,jdbcType=LONGVARCHAR},
thumbnail_dis_base64 = #{record.thumbnailDisBase64,jdbcType=LONGVARCHAR} thumbnail_dis_base64 = #{record.thumbnailDisBase64,jdbcType=LONGVARCHAR},
thumbnail_sys_alarm_base64 = #{record.thumbnailSysAlarmBase64,jdbcType=LONGVARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -366,6 +377,9 @@
<if test="thumbnailDisBase64 != null"> <if test="thumbnailDisBase64 != null">
thumbnail_dis_base64 = #{thumbnailDisBase64,jdbcType=LONGVARCHAR}, thumbnail_dis_base64 = #{thumbnailDisBase64,jdbcType=LONGVARCHAR},
</if> </if>
<if test="thumbnailSysAlarmBase64 != null">
thumbnail_sys_alarm_base64 = #{thumbnailSysAlarmBase64,jdbcType=LONGVARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
@ -382,7 +396,8 @@
`type` = #{type,jdbcType=INTEGER}, `type` = #{type,jdbcType=INTEGER},
thumbnail_normal_base64 = #{thumbnailNormalBase64,jdbcType=LONGVARCHAR}, thumbnail_normal_base64 = #{thumbnailNormalBase64,jdbcType=LONGVARCHAR},
thumbnail_alarm_base64 = #{thumbnailAlarmBase64,jdbcType=LONGVARCHAR}, thumbnail_alarm_base64 = #{thumbnailAlarmBase64,jdbcType=LONGVARCHAR},
thumbnail_dis_base64 = #{thumbnailDisBase64,jdbcType=LONGVARCHAR} thumbnail_dis_base64 = #{thumbnailDisBase64,jdbcType=LONGVARCHAR},
thumbnail_sys_alarm_base64 = #{thumbnailSysAlarmBase64,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBig"> <update id="updateByPrimaryKey" parameterType="com.techsor.datacenter.business.model.BasicAssetClassBig">

29
data-center-business-dao/src/main/resources/mappers/auto/BasicSalesforceMapper.xml

@ -10,6 +10,7 @@
<result column="company_id" jdbcType="BIGINT" property="companyId" /> <result column="company_id" jdbcType="BIGINT" property="companyId" />
<result column="salesforce_id" jdbcType="VARCHAR" property="salesforceId" /> <result column="salesforce_id" jdbcType="VARCHAR" property="salesforceId" />
<result column="building_id" jdbcType="BIGINT" property="buildingId" /> <result column="building_id" jdbcType="BIGINT" property="buildingId" />
<result column="alias" jdbcType="VARCHAR" property="alias" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="flag" jdbcType="INTEGER" property="flag" /> <result column="flag" jdbcType="INTEGER" property="flag" />
<result column="create_time" jdbcType="BIGINT" property="createTime" /> <result column="create_time" jdbcType="BIGINT" property="createTime" />
@ -88,7 +89,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, company_id, salesforce_id, building_id, remark, flag, create_time, creator_id, id, company_id, salesforce_id, building_id, `alias`, remark, flag, create_time, creator_id,
modify_time, modifier_id modify_time, modifier_id
</sql> </sql>
<select id="selectByExample" parameterType="com.techsor.datacenter.business.model.BasicSalesforceExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.BasicSalesforceExample" resultMap="BaseResultMap">
@ -147,13 +148,13 @@
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into basic_salesforce (company_id, salesforce_id, building_id, insert into basic_salesforce (company_id, salesforce_id, building_id,
remark, flag, create_time, `alias`, remark, flag,
creator_id, modify_time, modifier_id create_time, creator_id, modify_time,
) modifier_id)
values (#{companyId,jdbcType=BIGINT}, #{salesforceId,jdbcType=VARCHAR}, #{buildingId,jdbcType=BIGINT}, values (#{companyId,jdbcType=BIGINT}, #{salesforceId,jdbcType=VARCHAR}, #{buildingId,jdbcType=BIGINT},
#{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, #{alias,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER},
#{creatorId,jdbcType=BIGINT}, #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT} #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, #{modifyTime,jdbcType=BIGINT},
) #{modifierId,jdbcType=BIGINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicSalesforce"> <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicSalesforce">
<!-- <!--
@ -174,6 +175,9 @@
<if test="buildingId != null"> <if test="buildingId != null">
building_id, building_id,
</if> </if>
<if test="alias != null">
`alias`,
</if>
<if test="remark != null"> <if test="remark != null">
remark, remark,
</if> </if>
@ -203,6 +207,9 @@
<if test="buildingId != null"> <if test="buildingId != null">
#{buildingId,jdbcType=BIGINT}, #{buildingId,jdbcType=BIGINT},
</if> </if>
<if test="alias != null">
#{alias,jdbcType=VARCHAR},
</if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
@ -252,6 +259,9 @@
<if test="record.buildingId != null"> <if test="record.buildingId != null">
building_id = #{record.buildingId,jdbcType=BIGINT}, building_id = #{record.buildingId,jdbcType=BIGINT},
</if> </if>
<if test="record.alias != null">
`alias` = #{record.alias,jdbcType=VARCHAR},
</if>
<if test="record.remark != null"> <if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
@ -285,6 +295,7 @@
company_id = #{record.companyId,jdbcType=BIGINT}, company_id = #{record.companyId,jdbcType=BIGINT},
salesforce_id = #{record.salesforceId,jdbcType=VARCHAR}, salesforce_id = #{record.salesforceId,jdbcType=VARCHAR},
building_id = #{record.buildingId,jdbcType=BIGINT}, building_id = #{record.buildingId,jdbcType=BIGINT},
`alias` = #{record.alias,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
flag = #{record.flag,jdbcType=INTEGER}, flag = #{record.flag,jdbcType=INTEGER},
create_time = #{record.createTime,jdbcType=BIGINT}, create_time = #{record.createTime,jdbcType=BIGINT},
@ -311,6 +322,9 @@
<if test="buildingId != null"> <if test="buildingId != null">
building_id = #{buildingId,jdbcType=BIGINT}, building_id = #{buildingId,jdbcType=BIGINT},
</if> </if>
<if test="alias != null">
`alias` = #{alias,jdbcType=VARCHAR},
</if>
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
@ -341,6 +355,7 @@
set company_id = #{companyId,jdbcType=BIGINT}, set company_id = #{companyId,jdbcType=BIGINT},
salesforce_id = #{salesforceId,jdbcType=VARCHAR}, salesforce_id = #{salesforceId,jdbcType=VARCHAR},
building_id = #{buildingId,jdbcType=BIGINT}, building_id = #{buildingId,jdbcType=BIGINT},
`alias` = #{alias,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
flag = #{flag,jdbcType=INTEGER}, flag = #{flag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=BIGINT}, create_time = #{createTime,jdbcType=BIGINT},

7
data-center-business-dao/src/main/resources/mappers/ex/BasicSalesforceMapperExt.xml

@ -109,6 +109,7 @@
bsales.salesforce_id, bsales.salesforce_id,
bsales.remark, bsales.remark,
bsales.alias,
-- site -- site
s.id AS site_id, s.id AS site_id,
@ -198,6 +199,9 @@
<if test="salesforceId != null and salesforceId != ''"> <if test="salesforceId != null and salesforceId != ''">
AND bsales.salesforce_id LIKE CONCAT('%', #{salesforceId}, '%') AND bsales.salesforce_id LIKE CONCAT('%', #{salesforceId}, '%')
</if> </if>
<if test="alias != null and alias != ''">
AND bsales.alias LIKE CONCAT('%', #{alias}, '%')
</if>
ORDER BY bsales.id DESC ORDER BY bsales.id DESC
@ -224,7 +228,8 @@
SELECT SELECT
s.salesforce_id, s.salesforce_id,
s.id, s.id,
s.remark s.remark,
s.alias
FROM FROM
basic_salesforce s basic_salesforce s
LEFT JOIN basic_building b ON s.id = b.salesforce_primary_id AND b.flag = 0 LEFT JOIN basic_building b ON s.id = b.salesforce_primary_id AND b.flag = 0

2
data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/salesforce/OptSalesforceParams.java

@ -30,5 +30,7 @@ public class OptSalesforceParams{
@Schema(description = "备注", example = "user1", required = true) @Schema(description = "备注", example = "user1", required = true)
private String remark; private String remark;
@Schema(description = "别名", example = "alias")
private String alias;
} }

3
data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/salesforce/SalesforceSearchParams.java

@ -17,6 +17,9 @@ public class SalesforceSearchParams extends BaseSearchParams{
@Schema(description = "Salesforce id", example = "testSalesforce1", required = true) @Schema(description = "Salesforce id", example = "testSalesforce1", required = true)
private String salesforceId; private String salesforceId;
@Schema(description = "别名", example = "alias")
private String alias;
@Schema(description = "Salesforce IDs, multiple IDs separated by comma", example = "1,47") @Schema(description = "Salesforce IDs, multiple IDs separated by comma", example = "1,47")
private String ids; private String ids;

34
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicAssetClassBig.java

@ -84,6 +84,15 @@ public class BasicAssetClassBig implements Serializable {
*/ */
private String thumbnailDisBase64; private String thumbnailDisBase64;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column basic_asset_class_big.thumbnail_sys_alarm_base64
*
* @mbg.generated
*/
private String thumbnailSysAlarmBase64;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table basic_asset_class_big * This field corresponds to the database table basic_asset_class_big
@ -308,6 +317,30 @@ public class BasicAssetClassBig implements Serializable {
this.thumbnailDisBase64 = thumbnailDisBase64 == null ? null : thumbnailDisBase64.trim(); this.thumbnailDisBase64 = thumbnailDisBase64 == null ? null : thumbnailDisBase64.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column basic_asset_class_big.thumbnail_sys_alarm_base64
*
* @return the value of basic_asset_class_big.thumbnail_sys_alarm_base64
*
* @mbg.generated
*/
public String getThumbnailSysAlarmBase64() {
return thumbnailSysAlarmBase64;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column basic_asset_class_big.thumbnail_sys_alarm_base64
*
* @param thumbnailSysAlarmBase64 the value for basic_asset_class_big.thumbnail_sys_alarm_base64
*
* @mbg.generated
*/
public void setThumbnailSysAlarmBase64(String thumbnailSysAlarmBase64) {
this.thumbnailSysAlarmBase64 = thumbnailSysAlarmBase64 == null ? null : thumbnailSysAlarmBase64.trim();
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table basic_asset_class_big * This method corresponds to the database table basic_asset_class_big
@ -329,6 +362,7 @@ public class BasicAssetClassBig implements Serializable {
sb.append(", thumbnailNormalBase64=").append(thumbnailNormalBase64); sb.append(", thumbnailNormalBase64=").append(thumbnailNormalBase64);
sb.append(", thumbnailAlarmBase64=").append(thumbnailAlarmBase64); sb.append(", thumbnailAlarmBase64=").append(thumbnailAlarmBase64);
sb.append(", thumbnailDisBase64=").append(thumbnailDisBase64); sb.append(", thumbnailDisBase64=").append(thumbnailDisBase64);
sb.append(", thumbnailSysAlarmBase64=").append(thumbnailSysAlarmBase64);
sb.append(", serialVersionUID=").append(serialVersionUID); sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();

34
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicSalesforce.java

@ -39,6 +39,15 @@ public class BasicSalesforce implements Serializable {
*/ */
private Long buildingId; private Long buildingId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column basic_salesforce.alias
*
* @mbg.generated
*/
private String alias;
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@ -197,6 +206,30 @@ public class BasicSalesforce implements Serializable {
this.buildingId = buildingId; this.buildingId = buildingId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column basic_salesforce.alias
*
* @return the value of basic_salesforce.alias
*
* @mbg.generated
*/
public String getAlias() {
return alias;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column basic_salesforce.alias
*
* @param alias the value for basic_salesforce.alias
*
* @mbg.generated
*/
public void setAlias(String alias) {
this.alias = alias == null ? null : alias.trim();
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column basic_salesforce.remark * This method returns the value of the database column basic_salesforce.remark
@ -357,6 +390,7 @@ public class BasicSalesforce implements Serializable {
sb.append(", companyId=").append(companyId); sb.append(", companyId=").append(companyId);
sb.append(", salesforceId=").append(salesforceId); sb.append(", salesforceId=").append(salesforceId);
sb.append(", buildingId=").append(buildingId); sb.append(", buildingId=").append(buildingId);
sb.append(", alias=").append(alias);
sb.append(", remark=").append(remark); sb.append(", remark=").append(remark);
sb.append(", flag=").append(flag); sb.append(", flag=").append(flag);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);

70
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicSalesforceExample.java

@ -444,6 +444,76 @@ public class BasicSalesforceExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAliasIsNull() {
addCriterion("`alias` is null");
return (Criteria) this;
}
public Criteria andAliasIsNotNull() {
addCriterion("`alias` is not null");
return (Criteria) this;
}
public Criteria andAliasEqualTo(String value) {
addCriterion("`alias` =", value, "alias");
return (Criteria) this;
}
public Criteria andAliasNotEqualTo(String value) {
addCriterion("`alias` <>", value, "alias");
return (Criteria) this;
}
public Criteria andAliasGreaterThan(String value) {
addCriterion("`alias` >", value, "alias");
return (Criteria) this;
}
public Criteria andAliasGreaterThanOrEqualTo(String value) {
addCriterion("`alias` >=", value, "alias");
return (Criteria) this;
}
public Criteria andAliasLessThan(String value) {
addCriterion("`alias` <", value, "alias");
return (Criteria) this;
}
public Criteria andAliasLessThanOrEqualTo(String value) {
addCriterion("`alias` <=", value, "alias");
return (Criteria) this;
}
public Criteria andAliasLike(String value) {
addCriterion("`alias` like", value, "alias");
return (Criteria) this;
}
public Criteria andAliasNotLike(String value) {
addCriterion("`alias` not like", value, "alias");
return (Criteria) this;
}
public Criteria andAliasIn(List<String> values) {
addCriterion("`alias` in", values, "alias");
return (Criteria) this;
}
public Criteria andAliasNotIn(List<String> values) {
addCriterion("`alias` not in", values, "alias");
return (Criteria) this;
}
public Criteria andAliasBetween(String value1, String value2) {
addCriterion("`alias` between", value1, value2, "alias");
return (Criteria) this;
}
public Criteria andAliasNotBetween(String value1, String value2) {
addCriterion("`alias` not between", value1, value2, "alias");
return (Criteria) this;
}
public Criteria andRemarkIsNull() { public Criteria andRemarkIsNull() {
addCriterion("remark is null"); addCriterion("remark is null");
return (Criteria) this; return (Criteria) this;

4
data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/salesforce/SalesforcePageVO.java

@ -52,10 +52,12 @@ public class SalesforcePageVO {
@Schema(description = "site编码", example = "user1", required = false) @Schema(description = "site编码", example = "user1", required = false)
private String siteCode; private String siteCode;
@Schema(description = "备注", example = "user1", required = true, hidden = true) @Schema(description = "备注", example = "user1", required = true, hidden = true)
private String remark; private String remark;
@Schema(description = "别名", example = "alias")
private String alias;
// @Schema(description = "device primary key ID,separated by commas", example = "1,2,3") // @Schema(description = "device primary key ID,separated by commas", example = "1,2,3")
// private String deviceInfoIds; // private String deviceInfoIds;
// //

3
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/SalesforceServiceImpl.java

@ -300,6 +300,9 @@ public class SalesforceServiceImpl implements SalesforceService {
BeanUtils.copyProperties(optSalesforceParams, basicSalesforce); BeanUtils.copyProperties(optSalesforceParams, basicSalesforce);
basicSalesforce.setModifierId(userId); basicSalesforce.setModifierId(userId);
basicSalesforce.setModifyTime(System.currentTimeMillis()); basicSalesforce.setModifyTime(System.currentTimeMillis());
if (StringUtils.isBlank(basicSalesforce.getAlias())) {
basicSalesforce.setAlias("");
}
BasicSalesforceExample example = new BasicSalesforceExample(); BasicSalesforceExample example = new BasicSalesforceExample();
BasicSalesforceExample.Criteria criteria = example.createCriteria(); BasicSalesforceExample.Criteria criteria = example.createCriteria();

Loading…
Cancel
Save