From 3a38fa7d29d93479264ff1986e936cecdaac1457 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 25 十一月 2022 16:04:13 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java | 58 +++++++++
ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java | 16 ++
ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java | 2
ycl-platform/src/main/resources/mapper/equipment/OrgGridMapper.xml | 19 +++
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 12 -
ycl-common/src/main/java/com/ycl/utils/MD5Util.java | 20 +++
/dev/null | 83 -------------
ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java | 64 ++++++++++
ycl-platform/src/main/java/com/ycl/mapper/equipment/OrgGridMapper.java | 18 +++
ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java | 21 +++
ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml | 4
ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml | 4
ycl-common/src/main/java/com/ycl/controller/constant/SysConst.java | 2
13 files changed, 227 insertions(+), 96 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/constant/SysConst.java b/ycl-common/src/main/java/com/ycl/controller/constant/SysConst.java
similarity index 89%
rename from ycl-common/src/main/java/com/ycl/constant/SysConst.java
rename to ycl-common/src/main/java/com/ycl/controller/constant/SysConst.java
index 3bf4301..b5d2226 100644
--- a/ycl-common/src/main/java/com/ycl/constant/SysConst.java
+++ b/ycl-common/src/main/java/com/ycl/controller/constant/SysConst.java
@@ -1,4 +1,4 @@
-package com.ycl.constant;
+package com.ycl.controller.constant;
/**
* 鍏ㄥ眬甯搁噺
diff --git a/ycl-common/src/main/java/com/ycl/utils/MD5Util.java b/ycl-common/src/main/java/com/ycl/utils/MD5Util.java
index 3fa2973..df1d411 100644
--- a/ycl-common/src/main/java/com/ycl/utils/MD5Util.java
+++ b/ycl-common/src/main/java/com/ycl/utils/MD5Util.java
@@ -99,4 +99,24 @@
}
return str;
}
+
+ public static String md5Encrypt(String string) {
+ byte[] hash;
+ try {
+ //鍒涘缓涓�涓狹D5绠楁硶瀵硅薄锛屽苟鑾峰緱MD5瀛楄妭鏁扮粍,16*8=128浣�
+ hash = MessageDigest.getInstance("MD5").digest(string.getBytes("UTF-8"));
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("Huh, MD5 should be supported?", e);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException("Huh, UTF-8 should be supported?", e);
+ }
+
+ //杞崲涓哄崄鍏繘鍒跺瓧绗︿覆
+ StringBuilder hex = new StringBuilder(hash.length * 2);
+ for (byte b : hash) {
+ if ((b & 0xFF) < 0x10) hex.append("0");
+ hex.append(Integer.toHexString(b & 0xFF));
+ }
+ return hex.toString();
+ }
}
diff --git a/ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java b/ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java
index 336e6a9..36e6d33 100644
--- a/ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java
+++ b/ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java
@@ -1,6 +1,6 @@
package com.ycl.utils.common;
-import com.ycl.constant.SysConst;
+import com.ycl.controller.constant.SysConst;
/**
* <p>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
new file mode 100644
index 0000000..e952c59
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
@@ -0,0 +1,64 @@
+package com.ycl.controller.epuipment;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
+import com.ycl.api.CommonResult;
+import com.ycl.controller.BaseController;
+import com.ycl.entity.equipment.OrgGrid;
+import com.ycl.service.equipment.IOrgGridService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 缃戞牸绠＄悊 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-24
+ */
+@RestController
+@RequestMapping("/org_grid")
+@Api(tags = "缃戞牸绠＄悊")
+public class OrgGridController extends BaseController {
+
+ @Autowired
+ IOrgGridService iOrgGridService;
+
+ @GetMapping("/query")
+ @ApiOperation(value = "鏌ヨ缃戞牸")
+ public CommonResult search(@RequestParam(required = false) String area,
+ @RequestParam Integer size,
+ @RequestParam Integer current) {
+ return CommonResult.success(iOrgGridService.page(new Page<>(size, current), new LambdaQueryWrapper<OrgGrid>()
+ .like(StringUtils.isNotBlank(area), OrgGrid::getArea, area)));
+ }
+
+ @PostMapping("/addition")
+ @ApiOperation(value = "娣诲姞")
+ @LogSave(operationType = "缃戞牸绠＄悊", contain = "娣诲姞")
+ public CommonResult add(@RequestBody OrgGrid orgGrid) {
+ return CommonResult.success(iOrgGridService.save(orgGrid));
+ }
+
+ @DeleteMapping("/deletion")
+ @ApiOperation(value = "鍒犻櫎")
+ @LogSave(operationType = "缃戞牸绠＄悊", contain = "鍒犻櫎")
+ public CommonResult delete(@RequestParam Integer id) {
+ return CommonResult.success(iOrgGridService.removeById(id));
+ }
+
+ @GetMapping("/modification")
+ @ApiOperation(value = "淇敼")
+ @LogSave(operationType = "缃戞牸绠＄悊", contain = "淇敼")
+ public CommonResult modify(@RequestBody OrgGrid orgGrid) {
+ return CommonResult.success(iOrgGridService.updateById(orgGrid));
+ }
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java
new file mode 100644
index 0000000..f0af5ee
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java
@@ -0,0 +1,58 @@
+package com.ycl.entity.equipment;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 缃戞牸绠＄悊
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_org_grid")
+public class OrgGrid implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 缃戞牸鍛樺鍚�
+ */
+ @TableField("worker")
+ private String worker;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @TableField("contact")
+ private String contact;
+
+ /**
+ * 鍖哄煙鍚嶇О
+ */
+ @TableField("area")
+ private String area;
+
+ /**
+ * 鍖哄煙-鍧愭爣闆嗗悎
+ */
+ @TableField("region")
+ private String region;
+
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/equipment/OrgGridMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/equipment/OrgGridMapper.java
new file mode 100644
index 0000000..8a9f583
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/equipment/OrgGridMapper.java
@@ -0,0 +1,18 @@
+package com.ycl.mapper.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.equipment.OrgGrid;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 缃戞牸绠＄悊 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-24
+ */
+@Mapper
+public interface OrgGridMapper extends BaseMapper<OrgGrid> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java b/ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java
deleted file mode 100644
index 6788c08..0000000
--- a/ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.ycl.scheduling;
-
-import com.ycl.service.message.MessageScheduleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-
-//@Configuration
-//@EnableScheduling
-public class SchedulingConfiguration {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- //
- //鍏朵腑姣忎釜鍏冪礌鍙互鏄竴涓��(濡�6),涓�涓繛缁尯闂�(9-12),涓�涓棿闅旀椂闂�(8-18/4)(/琛ㄧず姣忛殧4灏忔椂),涓�涓垪琛�(1,3,5),閫氶厤绗︺�傜敱浜�"鏈堜唤涓殑鏃ユ湡"鍜�"鏄熸湡涓殑鏃ユ湡"杩欎袱涓厓绱犱簰鏂ョ殑,蹇呴』瑕佸鍏朵腑涓�涓缃�?.
- //0 0 10,14,16 * * ? 姣忓ぉ涓婂崍10鐐癸紝涓嬪崍2鐐癸紝4鐐�
- //0 0/30 9-17 * * ? 鏈濅節鏅氫簲宸ヤ綔鏃堕棿鍐呮瘡鍗婂皬鏃�
- //0 0 12 ? * WED 琛ㄧず姣忎釜鏄熸湡涓変腑鍗�12鐐�
- //"0 0 12 * * ?" 姣忓ぉ涓崍12鐐硅Е鍙�
- //"0 15 10 ? * *" 姣忓ぉ涓婂崍10:15瑙﹀彂
- //"0 15 10 * * ?" 姣忓ぉ涓婂崍10:15瑙﹀彂
- //"0 15 10 * * ? *" 姣忓ぉ涓婂崍10:15瑙﹀彂
- //"0 15 10 * * ? 2005" 2005骞寸殑姣忓ぉ涓婂崍10:15瑙﹀彂
- //"0 * 14 * * ?" 鍦ㄦ瘡澶╀笅鍗�2鐐瑰埌涓嬪崍2:59鏈熼棿鐨勬瘡1鍒嗛挓瑙﹀彂
- //"0 0/5 14 * * ?" 鍦ㄦ瘡澶╀笅鍗�2鐐瑰埌涓嬪崍2:55鏈熼棿鐨勬瘡5鍒嗛挓瑙﹀彂
- //"0 0/5 14,18 * * ?" 鍦ㄦ瘡澶╀笅鍗�2鐐瑰埌2:55鏈熼棿鍜屼笅鍗�6鐐瑰埌6:55鏈熼棿鐨勬瘡5鍒嗛挓瑙﹀彂
- //"0 0-5 14 * * ?" 鍦ㄦ瘡澶╀笅鍗�2鐐瑰埌涓嬪崍2:05鏈熼棿鐨勬瘡1鍒嗛挓瑙﹀彂
- //"0 10,44 14 ? 3 WED" 姣忓勾涓夋湀鐨勬槦鏈熶笁鐨勪笅鍗�2:10鍜�2:44瑙﹀彂
- //"0 15 10 ? * MON-FRI" 鍛ㄤ竴鑷冲懆浜旂殑涓婂崍10:15瑙﹀彂
- //"0 15 10 15 * ?" 姣忔湀15鏃ヤ笂鍗�10:15瑙﹀彂
- //"0 15 10 L * ?" 姣忔湀鏈�鍚庝竴鏃ョ殑涓婂崍10:15瑙﹀彂
- //"0 15 10 ? * 6L" 姣忔湀鐨勬渶鍚庝竴涓槦鏈熶簲涓婂崍10:15瑙﹀彂
- //"0 15 10 ? * 6L 2002-2005" 2002骞磋嚦2005骞寸殑姣忔湀鐨勬渶鍚庝竴涓槦鏈熶簲涓婂崍10:15瑙﹀彂
- //"0 15 10 ? * 6#3" 姣忔湀鐨勭涓変釜鏄熸湡浜斾笂鍗�10:15瑙﹀彂
- //鏈変簺瀛愯〃杈惧紡鑳藉寘鍚竴浜涜寖鍥存垨鍒楄〃
- //渚嬪锛氬瓙琛ㄨ揪寮忥紙澶╋紙鏄熸湡锛夛級鍙互涓� 鈥淢ON-FRI鈥濓紝鈥淢ON锛學ED锛孎RI鈥濓紝鈥淢ON-WED,SAT鈥�
- //鈥�*鈥濆瓧绗︿唬琛ㄦ墍鏈夊彲鑳界殑鍊�
- //鍥犳锛屸��*鈥濆湪瀛愯〃杈惧紡锛堟湀锛夐噷琛ㄧず姣忎釜鏈堢殑鍚箟锛屸��*鈥濆湪瀛愯〃杈惧紡锛堝ぉ锛堟槦鏈燂級锛夎〃绀烘槦鏈熺殑姣忎竴澶�
- //
- //鈥�/鈥濆瓧绗︾敤鏉ユ寚瀹氭暟鍊肩殑澧為噺
- //渚嬪锛氬湪瀛愯〃杈惧紡锛堝垎閽燂級閲岀殑鈥�0/15鈥濊〃绀轰粠绗�0鍒嗛挓寮�濮嬶紝姣�15鍒嗛挓
- // 鍦ㄥ瓙琛ㄨ揪寮忥紙鍒嗛挓锛夐噷鐨勨��3/20鈥濊〃绀轰粠绗�3鍒嗛挓寮�濮嬶紝姣�20鍒嗛挓锛堝畠鍜屸��3锛�23锛�43鈥濓級鐨勫惈涔変竴鏍�
- //
- //鈥滐紵鈥濆瓧绗︿粎琚敤浜庡ぉ锛堟湀锛夊拰澶╋紙鏄熸湡锛変袱涓瓙琛ㄨ揪寮忥紝琛ㄧず涓嶆寚瀹氬��
- //褰�2涓瓙琛ㄨ揪寮忓叾涓箣涓�琚寚瀹氫簡鍊间互鍚庯紝涓轰簡閬垮厤鍐茬獊锛岄渶瑕佸皢鍙︿竴涓瓙琛ㄨ揪寮忕殑鍊艰涓衡�滐紵鈥�
- //
- //鈥淟鈥� 瀛楃浠呰鐢ㄤ簬澶╋紙鏈堬級鍜屽ぉ锛堟槦鏈燂級涓や釜瀛愯〃杈惧紡锛屽畠鏄崟璇嶁�渓ast鈥濈殑缂╁啓
- //浣嗘槸瀹冨湪涓や釜瀛愯〃杈惧紡閲岀殑鍚箟鏄笉鍚岀殑銆�
- //鍦ㄥぉ锛堟湀锛夊瓙琛ㄨ揪寮忎腑锛屸�淟鈥濊〃绀轰竴涓湀鐨勬渶鍚庝竴澶�
- //鍦ㄥぉ锛堟槦鏈燂級鑷〃杈惧紡涓紝鈥淟鈥濊〃绀轰竴涓槦鏈熺殑鏈�鍚庝竴澶╋紝涔熷氨鏄疭AT
- //濡傛灉鍦ㄢ�淟鈥濆墠鏈夊叿浣撶殑鍐呭锛屽畠灏卞叿鏈夊叾浠栫殑鍚箟浜�
- //渚嬪锛氣��6L鈥濊〃绀鸿繖涓湀鐨勫�掓暟绗紪澶╋紝鈥滐鸡锛诧缉锛�濊〃绀鸿繖涓湀鐨勬渶涓�涓槦鏈熶簲
- //娉ㄦ剰锛氬湪浣跨敤鈥淟鈥濆弬鏁版椂锛屼笉瑕佹寚瀹氬垪琛ㄦ垨鑼冨洿锛屽洜涓鸿繖浼氬鑷撮棶棰�
- //
- //
- //瀛楁 鍏佽鍊� 鍏佽鐨勭壒娈婂瓧绗�
- //绉� 0-59 , - * /
- //鍒� 0-59 , - * /
- //灏忔椂 0-23 , - * /
- //鏃ユ湡 1-31 , - * ? / L W C
- //鏈堜唤 1-12 鎴栬�� JAN-DEC , - * /
- //鏄熸湡 1-7 鎴栬�� SUN-SAT , - * ? / L C #
- //骞达紙鍙�夛級 鐣欑┖, 1970-2099 , -
-
- //鎸夐『搴忎緷娆′负
- //绉掞紙0~59锛�
- //鍒嗛挓锛�0~59锛�
- //灏忔椂锛�0~23锛�
- //澶╋紙鏈堬級锛�0~31锛屼絾鏄綘闇�瑕佽�冭檻浣犳湀鐨勫ぉ鏁帮級
- //鏈堬紙0~11锛�
- //澶╋紙鏄熸湡锛夛紙1~7 1=SUN 鎴� SUN锛孧ON锛孴UE锛學ED锛孴HU锛孎RI锛孲AT锛�
- //7.骞翠唤锛�1970锛�2099锛�
- @Autowired
- private MessageScheduleService messageScheduleService;
-
- @Scheduled(cron = "0/50 * * * * ?") // 姣�50绉掓墽琛屼竴娆�
- public void scheduler() {
- //瀹氭椂鎵弿鍙戦�佺煭淇�
- messageScheduleService.sendSmsSchedule();
- }
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java
new file mode 100644
index 0000000..35c2465
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.equipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.equipment.OrgGrid;
+
+/**
+ * <p>
+ * 缃戞牸绠＄悊 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-24
+ */
+public interface IOrgGridService extends IService<OrgGrid> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
new file mode 100644
index 0000000..2379fb2
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ycl.service.equipment.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.equipment.OrgGrid;
+import com.ycl.mapper.equipment.OrgGridMapper;
+import com.ycl.service.equipment.IOrgGridService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 缃戞牸绠＄悊 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-24
+ */
+@Service
+public class OrgGridServiceImpl extends ServiceImpl<OrgGridMapper, OrgGrid> implements IOrgGridService {
+
+}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 6928066..7635344 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -125,26 +125,24 @@
<select id="selectBaseCasePage" resultType="com.ycl.entity.caseHandler.BaseCase">
select t1.*,
- t2.name category_text,
t3.region_name community_text
from ums_base_case t1
- left join ums_data_dictionary t2 on t1.category = t2.id
left join ums_sccg_region t3 on t1.community_id=t3.id
<where>
<if test="categories != null">
- category = #{categories}
+ t1.category = #{categories}
</if>
<if test="communityId != null">
- and community_id = #{communityId}
+ and t1.community_id = #{communityId}
</if>
<if test="code != null and code !=''">
- and code like contact('%',#{code},'%')
+ and t1.code like contact('%',#{code},'%')
</if>
<if test="site != null and site!=''">
- and site like contact('%',#{site},'%')
+ and t1.site like contact('%',#{site},'%')
</if>
<if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
- and create_time between #{startTime} and #{endTime}
+ and t1.create_time between #{startTime} and #{endTime}
</if>
</where>
</select>
diff --git a/ycl-platform/src/main/resources/mapper/equipment/OrgGridMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/OrgGridMapper.xml
new file mode 100644
index 0000000..2b20916
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/equipment/OrgGridMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.mapper.equipment.OrgGridMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.equipment.OrgGrid">
+ <id column="id" property="id" />
+ <result column="worker" property="worker" />
+ <result column="contact" property="contact" />
+ <result column="area" property="area" />
+ <result column="region" property="region" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, worker, contact, area, region
+ </sql>
+
+</mapper>
diff --git a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
index bbd6238..a68d10e 100644
--- a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
@@ -31,8 +31,8 @@
LEFT JOIN ums_base_case t2 ON t1.belong_to_id = t2.id
LEFT JOIN ums_sccg_region t3 on t3.id=t2.community_id
<where>
- <if test="type != '' and type != null">
- t1.type=#{type}
+ <if test="type == '03' and type != null and type !='' ">
+ t1.type='03'
</if>
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
and t1.create_time between #{startTime} and #{endTime}
diff --git a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
index 8ef51ba..05bc44e 100644
--- a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
@@ -31,8 +31,8 @@
LEFT JOIN ums_base_case t2 ON t1.belong_to_id = t2.id
LEFT JOIN ums_sccg_region t3 on t3.id=t2.community_id
<where>
- <if test="type != '' and type != null">
- t1.type=#{type}
+ <if test="type == '03' and type != null and type !='' ">
+ t1.type='03'
</if>
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
and t1.create_time between #{startTime} and #{endTime}
--
Gitblit v1.8.0