From f51c752e616e5bb0358f2ff12ab6710687566b0a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 22 Apr 2019 14:30:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=89=A9=E5=B1=95=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxWeappExtSet.java | 4 ++ .../com/iformall/enums/EnumCarSupport.java | 38 +++++++++++++++++ .../service/WxWeappExtSetService.java | 10 +++++ .../impl/WxAuthorizerInfoServiceImpl.java | 2 + .../impl/WxWeappExtSetServiceImpl.java | 7 ++++ .../resources/mapper/WxWeappExtSetMapper.xml | 4 ++ .../controller/WxWeappExtSetController.java | 42 +++++++++++++++++++ 7 files changed, 107 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumCarSupport.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index 5372cb1..eff1ed1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -33,6 +33,9 @@ public class WxWeappExtSet implements Serializable { /**提交审核列表*/ @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") private String releaseJson; + /**提交审核列表*/ + @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") + private Integer carSupport; /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @@ -49,6 +52,7 @@ public class WxWeappExtSet implements Serializable { ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_json` DESC") ,ReleaseJson_ASC("`release_json` ASC"),ReleaseJson_DESC("`release_json` DESC") + ,CarSupport_ASC("`car_support` ASC"),CarSupport_DESC("`car_support` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarSupport.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarSupport.java new file mode 100644 index 0000000..aab316a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarSupport.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCarSupport { + + // 0-不支持 1-ETCP + + NOCAR(0, "暂未支持"), + ETCP(1, "ETCP"), + ; + + public static EnumCarSupport getEnum(Integer code) { + for (EnumCarSupport value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCarSupport(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java index 8edd36d..37e1165 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java @@ -3,6 +3,8 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxWeappExtSet; +import java.util.List; + public interface WxWeappExtSetService { /** @@ -14,6 +16,14 @@ public interface WxWeappExtSetService { * @return */ PageInfo listAsPage(WxWeappExtSet record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体查询列表 + * + * @param record + * @return + */ + List getList(WxWeappExtSet record); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index 7a49628..f3f1da0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.domain.po.WxWeappExtSet; import com.iformall.domain.vo.WxWeappInfo; +import com.iformall.enums.EnumCarSupport; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxAuthorizerInfoMapper; import com.iformall.mapper.WxWeappExtSetMapper; @@ -100,6 +101,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxWeappExtSet weappExtSet = new WxWeappExtSet(); weappExtSet.setId(record.getId()); weappExtSet.setAppId(record.getAuthorizerAppid()); + weappExtSet.setCarSupport(EnumCarSupport.NOCAR.getCode()); if(appinfo != null) { weappExtSet.setType(appinfo.getType()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java index 95262af..52c9215 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.List; + @Service public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { @@ -21,6 +23,11 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxWeappExtSetMapper.findList(record)); } + @Override + public List getList(WxWeappExtSet record) { + return wxWeappExtSetMapper.findList(record); + } + @Override public WxWeappExtSet getById(Long id) { return wxWeappExtSetMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml index 700b10a..fe6aa58 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml @@ -7,6 +7,7 @@ + @@ -26,6 +27,9 @@ and `type` = #{type} + + and `car_support` = #{carSupport} + and `create_date` = #{createDate} diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java index ad244a1..73437a8 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java @@ -1,20 +1,27 @@ package com.iformall.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxWeappExtSet; +import com.iformall.domain.vo.WxWeappInfo; +import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.WxWeappExtSetService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +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.Controller; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Stormeye Wu */ @@ -55,4 +62,39 @@ public class WxWeappExtSetController extends BaseController { return new ResultData(); } + @PostMapping("batchUpdate") + public ResultData batchAdd(@RequestBody WxWeappExtSet weappExtSet) { + logger.debug("[" + getIpAddr() + "] WxWeappExtSetController::batchAdd"); + if (null == weappExtSet) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if(StringUtils.isBlank(weappExtSet.getExtJson())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + String extJson = weappExtSet.getExtJson(); + JSONObject obj = JSON.parseObject(extJson); + if(obj == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + JSONObject extObj = obj.getJSONObject("ext"); + if(extObj == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxWeappExtSet extSetQ = new WxWeappExtSet(); + extSetQ.setType(weappExtSet.getType()); + List weappExtSetList = weappExtSetService.getList(extSetQ); + for(WxWeappExtSet info: weappExtSetList) { + obj.put("extAppid", info.getAppId()); + if(extObj != null) { + extObj.put("weappId", info.getAppId()); + obj.put("ext", extObj); + } + info.setExtJson(JSON.toJSONString(obj)); + try { + weappExtSetService.saveOrUpdate(info); + } catch (Exception e) { + logger.error("APPID " + info.getAppId() + ", 保存失败 " + e.getMessage()); + } + } + return new ResultData(); + } + }