From 60979307ec9c69e59336e8cdf1cc81c0790f8e77 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Jun 2021 14:51:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/CustomerStartPageDTO.java | 96 ++++++++ .../epmet/dto/form/HomeStartPageFromDTO.java | 25 ++ .../epmet/dto/form/SaveStartPageFromDTO.java | 49 ++++ .../com/epmet/dto/form/StartPageFromDTO.java | 26 ++ .../dto/result/HomeStartPageResultDTO.java | 31 +++ .../epmet/dto/result/StartPageResultDTO.java | 47 ++++ .../oper-customize-server/pom.xml | 6 + .../CustomerStartPageController.java | 140 +++++++++++ .../com/epmet/dao/CustomerStartPageDao.java | 48 ++++ .../epmet/entity/CustomerStartPageEntity.java | 66 +++++ .../epmet/excel/CustomerStartPageExcel.java | 71 ++++++ .../epmet/redis/CustomerStartPageRedis.java | 47 ++++ .../service/CustomerStartPageService.java | 121 +++++++++ .../impl/CustomerStartPageServiceImpl.java | 233 ++++++++++++++++++ .../resources/mapper/CustomerStartPageDao.xml | 27 ++ 15 files changed, 1033 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeStartPageFromDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveStartPageFromDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/StartPageResultDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/CustomerStartPageExcel.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/redis/CustomerStartPageRedis.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java new file mode 100644 index 0000000000..35bb386820 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java @@ -0,0 +1,96 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@Data +public class CustomerStartPageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 小程序所属端类型【居民端: resi 工作端: work】 + */ + private String clientType; + + /** + * 启动页文件url路径 + */ + private String url; + + /** + * 启动页展示时间，单位秒 + */ + private Integer time; + + /** + * 启动页文件类型(图片 - image、 视频 - video) + */ + private String type; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeStartPageFromDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeStartPageFromDTO.java new file mode 100644 index 0000000000..d544c9825b --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/HomeStartPageFromDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 小程序-启动页查询-接口入参 + * @Author sun + */ +@Data +public class HomeStartPageFromDTO implements Serializable { + + private static final long serialVersionUID = -6163303184086480522L; + /** + * extAppId + */ + @NotBlank(message = "小程序Id不能为空", groups = {Start.class}) + private String appId; + + public interface Start extends CustomerClientShowGroup {} + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveStartPageFromDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveStartPageFromDTO.java new file mode 100644 index 0000000000..b2cd013634 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveStartPageFromDTO.java @@ -0,0 +1,49 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 运营端-启动页查询-接口入参 + * @Author sun + */ +@Data +public class SaveStartPageFromDTO implements Serializable { + + private static final long serialVersionUID = -6163303184086480522L; + /** + * 客户ID + */ + @NotBlank(message = "客户Id不能为空", groups = {Save.class}) + private String customerId; + /** + * 启动页文件url路径 + */ + @NotBlank(message = "url路径不能为空", groups = {Save.class}) + private String url; + /** + * 小程序所属端类型【居民端: resi 工作端: work】 + */ + @NotBlank(message = "所属端类型不能为空", groups = {Save.class}) + private String clientType; + /** + * 启动页展示时间，单位秒 + */ + @NotNull(message = "展示时长不能为空", groups = {Save.class}) + @Min(value = 3, groups = {Save.class}) + @Max(value = 10, groups = {Save.class}) + private Integer time; + /** + * 启动页文件类型(图片 - image、 视频 - video) + */ + @NotBlank(message = "文件类型不能为空", groups = {Save.class}) + private String type; + public interface Save extends CustomerClientShowGroup {} + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java new file mode 100644 index 0000000000..819d03b563 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * 运营端-启动页查询-接口入参 + * @Author sun + */ +@Data +public class StartPageFromDTO implements Serializable { + + private static final long serialVersionUID = -6163303184086480522L; + /** + * 客户ID + */ + @NotBlank(message = "客户Id不能为空", groups = {Start.class}) + private String customerId; + + public interface Start extends CustomerClientShowGroup {} + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java new file mode 100644 index 0000000000..5b3769b325 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 小程序-启动页查询-接口入参 + * @Author sun + */ +@Data +public class HomeStartPageResultDTO implements Serializable { + private static final long serialVersionUID = 2971689193155710437L; + + /** + * 居民端启动页文件url路径 + */ + private String reisUrl; + /** + * 居民端启动页展示时间，单位秒 + */ + private Integer resiTime; + /** + * 工作端启动页文件url路径 + */ + private String workUrl; + /** + * 工作端启动页展示时间，单位秒 + */ + private Integer workTime; +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/StartPageResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/StartPageResultDTO.java new file mode 100644 index 0000000000..faa5171bd9 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/StartPageResultDTO.java @@ -0,0 +1,47 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 运营端-启动页查询-接口入参 + * @Author sun + */ +@Data +public class StartPageResultDTO implements Serializable { + private static final long serialVersionUID = 2971689193155710437L; + + /** + * 启动页文件url路径 + */ + private String url; + /** + * 小程序所属端类型【居民端: resi 工作端: work】 + */ + private String clientType; + /** + * 启动页展示时间，单位秒 + */ + private Integer time; + /** + * 【暂时没用】启动页文件类型(图片 - image、 视频 - video) + */ + private String type; + /** + * 默认值 + */ + private String defUrl; + /** + * 默认值 + */ + private String defClientType; + /** + * 默认值 + */ + private Integer defTime; + /** + * 默认值 + */ + private String defType; +} diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index e3eb48b48f..ae5cc37dbb 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -77,6 +77,12 @@ epmet-commons-rocketmq 2.0.0 + + com.epmet + epmet-third-client + 2.0.0 + compile + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java new file mode 100644 index 0000000000..816524cc89 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java @@ -0,0 +1,140 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.CustomerStartPageDTO; +import com.epmet.dto.form.HomeStartPageFromDTO; +import com.epmet.dto.form.SaveStartPageFromDTO; +import com.epmet.dto.form.StartPageFromDTO; +import com.epmet.dto.result.HomeStartPageResultDTO; +import com.epmet.dto.result.StartPageResultDTO; +import com.epmet.excel.CustomerStartPageExcel; +import com.epmet.service.CustomerStartPageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@RestController +@RequestMapping("customerstartpage") +public class CustomerStartPageController { + + @Autowired + private CustomerStartPageService customerStartPageService; + + @GetMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = customerStartPageService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id) { + CustomerStartPageDTO data = customerStartPageService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody CustomerStartPageDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + customerStartPageService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody CustomerStartPageDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + customerStartPageService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + customerStartPageService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = customerStartPageService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CustomerStartPageExcel.class); + } + + /** + * @param fromDTO + * @Author sun + * @Description 运营端-启动页查询 + **/ + @PostMapping("startpage") + public Result> startPage(@RequestBody StartPageFromDTO fromDTO) { + ValidatorUtils.validateEntity(fromDTO, StartPageFromDTO.Start.class); + return new Result>().ok(customerStartPageService.startPage(fromDTO)); + } + + /** + * @param listDTO + * @Author sun + * @Description 运营端-启动页保存 + **/ + @PostMapping("savestartpage") + public Result saveStartPage(@RequestBody List listDTO) { + if (null == listDTO || listDTO.size() < NumConstant.ONE) { + throw new RenException("参数错误，集合元素不能为空"); + } + for (SaveStartPageFromDTO formDTO : listDTO) { + ValidatorUtils.validateEntity(formDTO, SaveStartPageFromDTO.Save.class); + } + customerStartPageService.saveStartPage(listDTO); + return new Result(); + } + + /** + * @param fromDTO + * @Author sun + * @Description 小程序-启动页查询 + **/ + @PostMapping("homestartpage") + public Result homeStartPage(@RequestBody HomeStartPageFromDTO fromDTO) { + ValidatorUtils.validateEntity(fromDTO, HomeStartPageFromDTO.Start.class); + return new Result().ok(customerStartPageService.homeStartPage(fromDTO)); + } + +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java new file mode 100644 index 0000000000..42ec6d77a3 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java @@ -0,0 +1,48 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.StartPageResultDTO; +import com.epmet.entity.CustomerStartPageEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@Mapper +public interface CustomerStartPageDao extends BaseDao { + + /** + * @Author sun + * @Description 查询客户启动页配置数据 + **/ + List selectByCustomerId(@Param("customerId") String customerId); + + /** + * @Author sun + * @Description 根据客户Id删除可能存在的配置数据 + **/ + int delByCustomerId(@Param("customerId") String customerId); +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java new file mode 100644 index 0000000000..54912ab392 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java @@ -0,0 +1,66 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("customer_start_page") +public class CustomerStartPageEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 小程序所属端类型【居民端: resi 工作端: work】 + */ + private String clientType; + + /** + * 启动页文件url路径 + */ + private String url; + + /** + * 启动页展示时间，单位秒 + */ + private Integer time; + + /** + * 启动页文件类型(图片 - image、 视频 - video) + */ + private String type; + +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/CustomerStartPageExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/CustomerStartPageExcel.java new file mode 100644 index 0000000000..c3501d206f --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/CustomerStartPageExcel.java @@ -0,0 +1,71 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@Data +public class CustomerStartPageExcel { + + @Excel(name = "唯一标识") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "小程序所属端类型【居民端: resi 工作端: work】") + private String clientType; + + @Excel(name = "启动页文件url路径") + private String url; + + @Excel(name = "启动页展示时间，单位秒") + private Integer time; + + @Excel(name = "启动页文件类型(图片 - image、 视频 - video)") + private String type; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/redis/CustomerStartPageRedis.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/redis/CustomerStartPageRedis.java new file mode 100644 index 0000000000..4ad0f1927b --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/redis/CustomerStartPageRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@Component +public class CustomerStartPageRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java new file mode 100644 index 0000000000..429fcf72cb --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java @@ -0,0 +1,121 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.CustomerStartPageDTO; +import com.epmet.dto.form.HomeStartPageFromDTO; +import com.epmet.dto.form.SaveStartPageFromDTO; +import com.epmet.dto.form.StartPageFromDTO; +import com.epmet.dto.result.HomeStartPageResultDTO; +import com.epmet.dto.result.StartPageResultDTO; +import com.epmet.entity.CustomerStartPageEntity; + +import java.util.List; +import java.util.Map; + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +public interface CustomerStartPageService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-06-21 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-06-21 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CustomerStartPageDTO + * @author generator + * @date 2021-06-21 + */ + CustomerStartPageDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-06-21 + */ + void save(CustomerStartPageDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-06-21 + */ + void update(CustomerStartPageDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-06-21 + */ + void delete(String[] ids); + + /** + * @param fromDTO + * @Author sun + * @Description 运营端-启动页查询 + **/ + List startPage(StartPageFromDTO fromDTO); + + /** + * @param listDTO + * @Author sun + * @Description 运营端-启动页保存 + **/ + void saveStartPage(List listDTO); + + /** + * @param fromDTO + * @Author sun + * @Description 小程序-启动页查询 + **/ + HomeStartPageResultDTO homeStartPage(HomeStartPageFromDTO fromDTO); +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java new file mode 100644 index 0000000000..3aad1b9454 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java @@ -0,0 +1,233 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.CustomerStartPageDao; +import com.epmet.dto.CustomerStartPageDTO; +import com.epmet.dto.PaCustomerDTO; +import com.epmet.dto.form.HomeStartPageFromDTO; +import com.epmet.dto.form.SaveStartPageFromDTO; +import com.epmet.dto.form.StartPageFromDTO; +import com.epmet.dto.result.HomeStartPageResultDTO; +import com.epmet.dto.result.StartPageResultDTO; +import com.epmet.entity.CustomerStartPageEntity; +import com.epmet.redis.CustomerStartPageRedis; +import com.epmet.service.CustomerStartPageService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 客户小程序启动页配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-21 + */ +@Service +public class CustomerStartPageServiceImpl extends BaseServiceImpl implements CustomerStartPageService { + private static final Logger logger = LoggerFactory.getLogger(CustomerStartPageServiceImpl.class); + @Autowired + private CustomerStartPageRedis customerStartPageRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CustomerStartPageDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CustomerStartPageDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CustomerStartPageDTO get(String id) { + CustomerStartPageEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CustomerStartPageDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CustomerStartPageDTO dto) { + CustomerStartPageEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStartPageEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CustomerStartPageDTO dto) { + CustomerStartPageEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStartPageEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * @param fromDTO + * @Author sun + * @Description 运营端-启动页查询 + **/ + @Override + public List startPage(StartPageFromDTO fromDTO) { + List resultList = new ArrayList<>(); + //1.按客户id查询客户数据 + resultList = baseDao.selectByCustomerId(fromDTO.getCustomerId()); + if (null == resultList || resultList.size() < NumConstant.ONE) { + StartPageResultDTO resi = new StartPageResultDTO(); + resi.setClientType("resi"); + resultList.add(resi); + StartPageResultDTO work = new StartPageResultDTO(); + work.setClientType("work"); + resultList.add(work); + } + + //2.查询默认客户数据 + List defList = baseDao.selectByCustomerId("default"); + + //3.封装数据并返回 + resultList.forEach(re -> { + defList.forEach(d -> { + if (re.getClientType().equals(d.getClientType())) { + re.setDefUrl(d.getUrl()); + re.setDefClientType(d.getClientType()); + re.setDefTime(d.getTime()); + re.setDefType(d.getType()); + } + }); + }); + + return resultList; + } + + /** + * @param listDTO + * @Author sun + * @Description 运营端-启动页保存 + **/ + @Override + @Transactional(rollbackFor = Exception.class) + public void saveStartPage(List listDTO) { + //1.按客户Id删除可能存在的历史数据 + baseDao.delByCustomerId(listDTO.get(0).getCustomerId()); + + //2.新增客户设置数据 + List list = new ArrayList<>(); + listDTO.forEach(l -> { + CustomerStartPageEntity entity = ConvertUtils.sourceToTarget(l, CustomerStartPageEntity.class); + list.add(entity); + }); + + insertBatch(list); + } + + /** + * @param fromDTO + * @Author sun + * @Description 小程序-启动页查询 + **/ + @Override + public HomeStartPageResultDTO homeStartPage(HomeStartPageFromDTO fromDTO) { + HomeStartPageResultDTO resultDTO = new HomeStartPageResultDTO(); + //1.调用third服务，根据appId查询客户Id + PaCustomerDTO dto = getCustomerInfo(fromDTO.getAppId()); + + //2.根据客户Id查询客户启动页数据 + List defList = baseDao.selectByCustomerId(dto.getId()); + + //3.封装数据并返回 + defList.forEach(d -> { + if ("resi".equals(d.getClientType())) { + resultDTO.setReisUrl(d.getUrl()); + resultDTO.setResiTime(d.getTime()); + } + if ("work".equals(d.getClientType())) { + resultDTO.setWorkUrl(d.getUrl()); + resultDTO.setWorkTime(d.getTime()); + } + }); + + return resultDTO; + } + + /** + * @param appId + * @Description 获取客户信息 + * @author sun + */ + public PaCustomerDTO getCustomerInfo(String appId) { + String url = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/"; + JSONObject jsonObject = new JSONObject(); + String data = HttpClientManager.getInstance().sendPostByJSON(url + appId, JSON.toJSONString(jsonObject)).getData(); + logger.info("CustomerStartPageServiceImpl.getCustomerInfo：httpclient->url:" + url + "，结果->" + data); + JSONObject toResult = JSON.parseObject(data); + Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + mapToResult.setCode(((Integer) toResult.get("code")).intValue()); + } + if (!mapToResult.success()) { + logger.error(String.format("根据appId查询客户Id失败，对应appId->" + appId)); + throw new RenException(mapToResult.getMsg()); + } + Object PublicCustomerResultDTO = mapToResult.getData(); + JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); + Map map = (Map) json.get("customer"); + PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); + logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); + return customer; + } + +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml new file mode 100644 index 0000000000..0f6edfab62 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + DELETE + FROM + customer_start_page + WHERE + customer_id = #{customerId} + + + \ No newline at end of file From 514bf41ceee8f4a87f0b74f9ac985137cfa0fcda Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Jun 2021 15:07:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=B8=8D=E9=9C=80=E8=A6=81token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index d797bc08bd..4259540d53 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -471,6 +471,7 @@ epmet: internalAuthUrlsWhiteList: - /epmetuser/customerstaff/customerlist - /gov/project/project/platformcallback + - /oper/customize/customerstartpage/homestartpage # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: From 9c6e95c3657477f875fbe36a5867d48600f64b54 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Jun 2021 16:21:58 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=A1=B5=E8=B5=8B=E5=80=BC=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CustomerStartPageServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java index 3aad1b9454..de93223bbf 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java @@ -187,7 +187,9 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl defList = baseDao.selectByCustomerId(dto.getId()); - + if(null==defList||defList.size() { if ("resi".equals(d.getClientType())) { From bedb2105600565da280c85aa1adf82852f44f93f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Jun 2021 17:10:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5sql=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.11__customer_start_page.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.11__customer_start_page.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.11__customer_start_page.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.11__customer_start_page.sql new file mode 100644 index 0000000000..70557e8e9d --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.11__customer_start_page.sql @@ -0,0 +1,18 @@ +CREATE TABLE `customer_start_page` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `CLIENT_TYPE` varchar(32) NOT NULL COMMENT '小程序所属端类型【居民端: resi 工作端: work】', + `URL` varchar(256) NOT NULL COMMENT '启动页文件url路径', + `TIME` int(11) NOT NULL DEFAULT '0' COMMENT '启动页展示时间，单位秒', + `TYPE` varchar(32) NOT NULL COMMENT '启动页文件类型(图片 - image、 视频 - video)', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='客户小程序启动页配置'; + +INSERT INTO `customer_start_page` VALUES ('3c3a2860d22d11ebbc490050568f8cf7', 'default', 'resi', 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20210621/a6e19dd7a39646b58ba29700d7d7dd64.jpg', '5', 'image', '0', '0', 'APP_USER', '2021-06-21 09:07:31', 'APP_USER', '2021-06-21 09:07:31'); +INSERT INTO `customer_start_page` VALUES ('45fb43a2d22d11ebbc490050568f8cf7', 'default', 'work', 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20210621/a6e19dd7a39646b58ba29700d7d7dd64.jpg', '5', 'image', '0', '0', 'APP_USER', '2021-06-21 09:07:31', 'APP_USER', '2021-06-21 09:07:31'); From 211018e5dd3e91680422e62aab3ca54e3de44f35 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Jun 2021 17:20:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=94=B9=E5=8D=95=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerStartPageController.java | 14 ++++++-------- .../java/com/epmet/dao/CustomerStartPageDao.java | 2 +- .../epmet/service/CustomerStartPageService.java | 4 ++-- .../impl/CustomerStartPageServiceImpl.java | 15 +++++---------- .../resources/mapper/CustomerStartPageDao.xml | 1 + 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java index 816524cc89..c90599c1ae 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java @@ -110,19 +110,17 @@ public class CustomerStartPageController { } /** - * @param listDTO + * @param formDTO * @Author sun * @Description 运营端-启动页保存 **/ @PostMapping("savestartpage") - public Result saveStartPage(@RequestBody List listDTO) { - if (null == listDTO || listDTO.size() < NumConstant.ONE) { - throw new RenException("参数错误，集合元素不能为空"); + public Result saveStartPage(@RequestBody SaveStartPageFromDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, SaveStartPageFromDTO.Save.class); + if (!"resi".equals(formDTO.getClientType()) && !"work".equals(formDTO.getClientType())) { + throw new RenException("参数错误，所属端类型值错误"); } - for (SaveStartPageFromDTO formDTO : listDTO) { - ValidatorUtils.validateEntity(formDTO, SaveStartPageFromDTO.Save.class); - } - customerStartPageService.saveStartPage(listDTO); + customerStartPageService.saveStartPage(formDTO); return new Result(); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java index 42ec6d77a3..75f1c674aa 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerStartPageDao.java @@ -44,5 +44,5 @@ public interface CustomerStartPageDao extends BaseDao { * @Author sun * @Description 根据客户Id删除可能存在的配置数据 **/ - int delByCustomerId(@Param("customerId") String customerId); + int delByCustomerId(@Param("customerId") String customerId, @Param("clientType") String clientType); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java index 429fcf72cb..ba4937cb0c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerStartPageService.java @@ -106,11 +106,11 @@ public interface CustomerStartPageService extends BaseService startPage(StartPageFromDTO fromDTO); /** - * @param listDTO + * @param formDTO * @Author sun * @Description 运营端-启动页保存 **/ - void saveStartPage(List listDTO); + void saveStartPage(SaveStartPageFromDTO formDTO); /** * @param fromDTO diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java index de93223bbf..0f4b64605e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java @@ -154,24 +154,19 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl listDTO) { + public void saveStartPage(SaveStartPageFromDTO formDTO) { //1.按客户Id删除可能存在的历史数据 - baseDao.delByCustomerId(listDTO.get(0).getCustomerId()); + baseDao.delByCustomerId(formDTO.getCustomerId(), formDTO.getClientType()); //2.新增客户设置数据 - List list = new ArrayList<>(); - listDTO.forEach(l -> { - CustomerStartPageEntity entity = ConvertUtils.sourceToTarget(l, CustomerStartPageEntity.class); - list.add(entity); - }); - - insertBatch(list); + CustomerStartPageEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerStartPageEntity.class); + insert(entity); } /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml index 0f6edfab62..0ea8c2ab16 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerStartPageDao.xml @@ -22,6 +22,7 @@ customer_start_page WHERE customer_id = #{customerId} + AND client_type = #{clientType} \ No newline at end of file From ae2e9762cef53f0fbcc4287f2914ca2dda599cca Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Jun 2021 17:49:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/HomeStartPageResultDTO.java | 2 +- .../impl/CustomerStartPageServiceImpl.java | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java index 5b3769b325..7d7fe5d990 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java @@ -15,7 +15,7 @@ public class HomeStartPageResultDTO implements Serializable { /** * 居民端启动页文件url路径 */ - private String reisUrl; + private String resiUrl; /** * 居民端启动页展示时间，单位秒 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java index 0f4b64605e..1ab9f564c6 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java @@ -47,10 +47,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 客户小程序启动页配置 @@ -133,6 +131,20 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl map = resultList.stream().collect(Collectors.toMap(StartPageResultDTO::getClientType,StartPageResultDTO::getClientType,(value1,value2)->{ + return value2; + })); + if(!map.containsKey("resi")){ + StartPageResultDTO resi = new StartPageResultDTO(); + resi.setClientType("resi"); + resultList.add(resi); + } + if(!map.containsKey("work")){ + StartPageResultDTO work = new StartPageResultDTO(); + work.setClientType("work"); + resultList.add(work); + } } //2.查询默认客户数据 @@ -188,7 +200,7 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl { if ("resi".equals(d.getClientType())) { - resultDTO.setReisUrl(d.getUrl()); + resultDTO.setResiUrl(d.getUrl()); resultDTO.setResiTime(d.getTime()); } if ("work".equals(d.getClientType())) { From f74080fb3bb45b07a7a38c3a2f14f6b918aee3f6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 23 Jun 2021 14:18:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/StaffPatrolRecordServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 25e0a4d4d9..86edad6f0b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -109,6 +109,7 @@ public enum EpmetErrorCode { ONLINE_BADGE_COUNT(8517, "最多上线5个徽章"), PATROL_REPEATED_SUBMIT_ERROR(8521, "巡查已结束，请勿重复提交"), PATROL_END_TIME_ERROR(8522, "巡查结束时间不能小于巡查开始时间"), + TIME_FORMAT_ERROR(8523, "时间格式错误"), // 该错误不会提示给前端，只是后端传输错误信息用。 ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"), OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"), diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index bdc2d9d86b..fd9e5891cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -191,7 +191,11 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl 0) { + Date endTime = DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN); + if (null == endTime) { + throw new RenException(EpmetErrorCode.TIME_FORMAT_ERROR.getCode()); + } + if (record.getPatrolStartTime().compareTo(endTime) > 0) { throw new RenException(EpmetErrorCode.PATROL_END_TIME_ERROR.getCode()); } record.setActrualEndTime(new Date());