Skip to content

S
szpt
Commit cb2d7d05 authored by 夏敏伟's avatar 夏敏伟
Browse files
Options

Merge branch 'master' of http://192.168.168.218/wcyuee/szpt 

# Conflicts:
#	src/test/java/com/zksy/szpt/TestHttpUtil.java
parents 705b270a 094dceae
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 52 deletions
src/main/java/com/zksy/szpt/controller/AppStoreController.java
View file @ cb2d7d05
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.ValidationGroups;
import com.zksy.szpt.domain.dto.AppStoreDTO;
import com.zksy.szpt.service.AppStoreService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@Api(tags = "appKey管理")
@RequestMapping("/rest/appStore")
@RestController
......@@ -29,13 +29,13 @@ public class AppStoreController {
@ApiOperation(value = "新增appKey", notes = "新增appKey")
@PostMapping("/insertAppStore")
public Integer insertAppStore(@RequestBody @Valid AppStoreDTO appStoreDTO) {
public Integer insertAppStore(@RequestBody @Validated({ValidationGroups.Create.class}) AppStoreDTO appStoreDTO) {
return appStoreService.insertAppStore(appStoreDTO);
}
@ApiOperation(value = "更新appKey", notes = "更新appKey")
@PostMapping("/updateAppIdSecret")
public Integer updateAppStore(@RequestBody @Valid AppStoreDTO appStoreDTO) {
public Integer updateAppStore(@RequestBody @Validated({ValidationGroups.Update.class}) AppStoreDTO appStoreDTO) {
return appStoreService.updateAppStore(appStoreDTO);
}
}
src/main/java/com/zksy/szpt/domain/ValidationGroups.java 0 → 100644
View file @ cb2d7d05
package com.zksy.szpt.domain;
public interface ValidationGroups {
interface Create {
}
interface Update {
}
interface Query {
}
}
src/main/java/com/zksy/szpt/domain/dto/AppStoreDTO.java
View file @ cb2d7d05
package com.zksy.szpt.domain.dto;
import com.zksy.szpt.domain.ValidationGroups;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -8,16 +9,15 @@ import javax.validation.constraints.NotBlank;
@ApiModel(value = "AppStoreDTO", description = "应用商店信息")
public class AppStoreDTO {
private Long id;
@ApiModelProperty(value = "应用Key", required = true)
@NotBlank
@NotBlank(groups = {ValidationGroups.Update.class}, message = "应用Key不能为空")
private String appKey;
@NotBlank
@NotBlank(message = "密钥不能为空")
@ApiModelProperty(value = "密钥", required = true)
private String appSecret;
@ApiModelProperty(value = "单位", required = true)
@ApiModelProperty(value = "单位", required = false)
private String deptCode;
public String getDeptCode() {
......@@ -28,13 +28,6 @@ public class AppStoreDTO {
this.deptCode = deptCode;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getAppKey() {
return appKey;
......
src/test/java/com/zksy/szpt/MainTest.java
View file @ cb2d7d05
package com.zksy.szpt;
import cn.hutool.core.date.DateUtil;
import com.zksy.szpt.domain.ListImageType;
import com.zksy.szpt.domain.UploadImageDTO;
import com.zksy.szpt.domain.dto.*;
......@@ -23,50 +24,88 @@ public class MainTest {
public void xxRwwcqkTest() {
//请求参数
XxRwwcqkDTO xxRwwcqkDTO = new XxRwwcqkDTO();
xxRwwcqkDTO.setRwid("12345678");
xxRwwcqkDTO.setXxyid("123456785");
xxRwwcqkDTO.setShrid("123456785");
xxRwwcqkDTO.setRwid("123456789101");
// xxRwwcqkDTO.setXxyid("1234567891015");
xxRwwcqkDTO.setWczt("1");
xxRwwcqkDTO.setBmzt("1");
xxRwwcqkDTO.setYjdw("1");
xxRwwcqkDTO.setXm("张五常");
xxRwwcqkDTO.setLxdh("12584587544");
xxRwwcqkDTO.setFknr("义务巡逻辖区内");
xxRwwcqkDTO.setJssj(new Date());
xxRwwcqkDTO.setFksj(new Date());
xxRwwcqkDTO.setShsj(new Date());
xxRwwcqkDTO.setShrxm("李凡");
xxRwwcqkDTO.setShrid("1");
xxRwwcqkDTO.setShsm("任务待完成");
xxRwwcqkDTO.setMchid("333021");
TestHttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
TestHttpUtil.signatureAndRequest("/rest/index/updateXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/index/updateXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
}
/**
* 任务完成情况
* 账户信息
*/
@Test
@DisplayName("账户信息")
public void zhxxtest() {
//请求参数
XxZhxxDTO dto = new XxZhxxDTO();
dto.setZhid("12345678");
// dto.setZhid("123456789101");
dto.setXxyid("11");
dto.setZt("2");
dto.setClbz("2");
TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class);
dto.setZt("1");
dto.setClbz("4");
dto.setZhid("3771928e-5917-45d2-a3cf-e8b6be6debb9");
dto.setZhlx("1");
dto.setXm("胡理");
dto.setSfzh("330182198011279346");
dto.setLxdh("13900000000");
dto.setOpenid("bc6dcba1ad58408197f6a0775d0a19e7");
dto.setNc("昵称3485");
dto.setUnionid("c7ae76e0940d47188bfe75ef419de0dd");
dto.setFsqbs("1");
dto.setAccountid("bcd2939d31743d580942fa231e2b96f");
dto.setRoles("1");
dto.setYqm("2");
dto.setYqmid("1");
dto.setClsj(new Date());
dto.setCljg("1");
dto.setFhsj(new Date());
dto.setOcuuid("290b63a465c84d88851f6609fc9f5d5a");
dto.setZhcs("1");
dto.setMchid("c449340a11e14638adf274bc7a8c6c7c");
// TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhxx/update", dto, XxZhxxDTO.class);
}
/**
* 任务完成情况
* 账户积分变更
*/
@Test
@DisplayName("账户积分变更")
public void test1() {
//请求参数
XxZhjfbgDTO dto = new XxZhjfbgDTO();
// dto.setZhid("12345678");
dto.setDhid("12345678");
dto.setZhid("1");
dto.setDhid("123456789101");
dto.setQbid("2");
dto.setBgsj(new Date());
dto.setBgjf(200L);
dto.setBghjf(300L);
dto.setBgqjf(500L);
dto.setBglx("2");
dto.setBz("积分兑换");
dto.setQbjlid("1");
TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/update", dto, XxZhjfbgDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/update", dto, XxZhjfbgDTO.class);
}
/**
* 任务完成情况
* 文件上传
*/
@Test
@DisplayName("文件上传")
......@@ -86,15 +125,30 @@ public class MainTest {
public void test4() {
//请求参数
XxYjrwDTO dto = new XxYjrwDTO();
// dto.setZhid("12345678");
dto.setRwid("1234567856");
dto.setRwbt("1");
dto.setRwnr("11111");
// dto.setZhid("123456789101");
dto.setRwid("123456789101");
dto.setRwbt("双节前三天海南离岛免税购物金额4.26亿元");
dto.setRwnr("中秋和国庆长假期间，海南离岛免税购物火爆。据海口海关统计，假期前三天，海口海关共监管离岛免税销售金额4.26亿元，比2022年同期增长40.3%，免税购物人数6.16万人次，比2022年同期增长84.1%。");
dto.setGzrs(1L);
dto.setSfsh(1);
dto.setWcrs(1L);
dto.setRjjljf(101L);
dto.setRwqsrq(new Date());
dto.setRwjzrq(DateUtil.endOfMonth(new Date()));
dto.setTimePattern(1);
dto.setScheduleId("1");
dto.setSfsh(1);
dto.setFbfwbm("1,10,2,3,4,");
dto.setFbrid("bbb919c6023646a9a6e595d385a60b95");
dto.setFbfw("红色卫队,绿色卫队,蓝色卫队,,白色卫队,,洪桥义警联盟,");
dto.setFbrxm("长兴管理员");
dto.setFbsj(new Date());
dto.setMchid("edc788af601211eeab44000c293a2347");
dto.setRwzt("1");
dto.setRwlx("1");
dto.setPictureUrls("https://pics5.baidu.com/feed/9825bc315c6034a8e54636072d08095b082376bf.jpeg@f_auto?token=98350f9a138414c8325ce9b265f43a9c,https://pics5.baidu.com/feed/9825bc315c6034a8e54636072d08095b082376bf.jpeg@f_auto?token=98350f9a138414c8325ce9b265f43a9c");
TestHttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjrw/update", dto, XxYjrwDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/xxYjrw/update", dto, XxYjrwDTO.class);
}
/**
......@@ -105,37 +159,75 @@ public class MainTest {
public void test5() {
//请求参数
XxYjdwdmDTO dto = new XxYjdwdmDTO();
// dto.setZhid("12345678");
dto.setDwlx(Integer.valueOf(1));
dto.setId("12345678");
// dto.setZhid("123456789101");
dto.setDwlx(Integer.valueOf(0));
dto.setId("123456789101");
dto.setMchid("11111");
dto.setZt("1");
dto.setYjdwmc("test");
dto.setYjdwmc("红色卫队");
dto.setYjdwjs("红色卫队是一支由青年人组成的卫队");
dto.setFid("-1");
TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/update", dto, XxYjdwdmDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/update", dto, XxYjdwdmDTO.class);
}
@Test
@DisplayName("社会信息员队伍")
public void test6() {
XxShxxyDwDTO dto = new XxShxxyDwDTO();
dto.setId("12345678");
dto.setDwdm("12345678");
dto.setShxxyid("12345678");
dto.setId("123456789101");
dto.setDwdm("10");
dto.setShxxyid("M15");
dto.setYjdwdm("1dbcf7b68e6911eea13b000c293a2347");
TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/update", dto, XxShxxyDwDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/update", dto, XxShxxyDwDTO.class);
}
@Test
@DisplayName("社会信息员")
public void test7() {
XxShxxyDTO dto = new XxShxxyDTO();
dto.setXxyid("12345678");
dto.setXxyid("123456789101");
dto.setZt("1");
dto.setSbfszt("1");
dto.setSbfszt("9");
dto.setShrid("1");
dto.setMchid("c449340a11e14638adf274bc7a8c6c7c");
dto.setDj("1");
dto.setFwcs("百脑汇3楼2022");
dto.setFsqbzs("12");
dto.setHfbz("test");
dto.setHjdz("江西省上饶市鼓楼街道春风小区1-1-101");
dto.setLxdh("18888888882");
dto.setLxdh2("18888888882");
dto.setLxdh3("11");
dto.setQbflid("70006015");
dto.setShsj(new Date());
dto.setZzdz("九莲新村3-1-502");
dto.setZym("1");
dto.setZylx("1");
dto.setYwjrxm("");
dto.setYjdw("");
dto.setXm("楼小满");
dto.setXxybh("M23");
dto.setXxylx("4");
dto.setWjsj(new Date());
dto.setWjrxm("开瑞");
dto.setWjrid("104");
dto.setShsm("审核不通过");
dto.setShsj(new Date());
dto.setShrxm("长兴管理员");
dto.setShrid("bbb919c6023646a9a6e595d385a60b95");
dto.setSfzh("330103198309012215");
dto.setQtzylx("1");
dto.setSsbmbm("330902010000");
dto.setSbfssj(new Date());
dto.setSbfsjg("");
dto.setHfbz("");
dto.setQbflid("70006015");
dto.setShbz("1");
TestHttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxShxxy/update", dto, XxShxxyDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/xxShxxy/update", dto, XxShxxyDTO.class);
}
......@@ -143,8 +235,9 @@ public class MainTest {
@DisplayName("删除服务")
public void testdelete() {
List<String> ids = new ArrayList<>();
ids.add("12345678");
ids.add("123456785");
ids.add("123456789101");
ids.add("1234567891015");
ids.add("1");
CommonDelParamDTO dto=new CommonDelParamDTO();
dto.setIds(ids);
// String url="xxShxxyDw/delete";
......@@ -153,12 +246,15 @@ public class MainTest {
// String url="xxYjrw/delete";
// String url="xxZhjfbg/delete";
// String url = "xxZhxx/delete";
CommonDelDTO delDTO=new CommonDelDTO();
delDTO.setIds(ids);
TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxShxxy/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjrw/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhxx/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/index/deleteXxRwwcqk", delDTO, CommonDelDTO.class);
}
}
src/test/java/com/zksy/szpt/TestHttpUtil.java
View file @ cb2d7d05
......@@ -12,8 +12,8 @@ import reactor.core.publisher.Mono;
public class TestHttpUtil {
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TestHttpUtil.class);
// final static String baseUrl = "https://demo.qmrzhz.cn:18030/szptsjjs";
final static String baseUrl = "http://localhost:8086";
final static String baseUrl = "https://demo.qmrzhz.cn:18030/szptsjjs";
// final static String baseUrl = "http://localhost:8086";
//请求头参数
static String nonce = "2";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment