Commit 0ed54532 authored by 夏敏伟's avatar 夏敏伟

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

parents d2c2f0ca 71e77ffe
......@@ -64,11 +64,11 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.3.1</version>
</dependency>
<!-- 升级pagehelper版本,解决提示no MyBatis mapper was found的错误-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version>
<version>1.2.13</version>
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
......
......@@ -4,7 +4,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan;
/**
* Hello world!
......
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxShxxyDTO;
import com.zksy.szpt.domain.dto.XxShxxyDwDTO;
import com.zksy.szpt.domain.dto.XxYjrwDTO;
......@@ -36,9 +37,9 @@ public class XxShxxyController {
}
@ApiOperation(value = "删除社会信息员数据")
@GetMapping("/delete")
public Integer delete(@RequestParam(name = "xxyid") String xxyid) {
return service.delete(xxyid);
@PostMapping("/delete")
public Integer delete(@RequestBody @Validated CommonDelDTO dto) {
return service.delete(dto);
}
}
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxShxxyDwDTO;
import com.zksy.szpt.domain.dto.XxYjrwDTO;
import com.zksy.szpt.service.XxShxxyDwService;
import com.zksy.szpt.service.XxYjrwService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Api(tags = "社会信息员队伍服务")
@RequestMapping("/rest/xxShxxydw")
@RequestMapping("/rest/xxShxxyDw")
@RestController
@Validated
public class XxShxxyDwController {
......@@ -34,9 +33,9 @@ public class XxShxxyDwController {
}
@ApiOperation(value = "删除社会信息员队伍数据")
@GetMapping("/delete")
public Integer delete(@RequestParam(name = "id") String id) {
return service.delete(id);
@PostMapping("/delete")
public Integer delete(@RequestBody @Validated CommonDelDTO dto) {
return service.delete(dto);
}
}
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxYjdwdmDTO;
import com.zksy.szpt.service.XxYjdwdmService;
import io.swagger.annotations.Api;
......@@ -8,7 +9,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Api(tags = "义警队伍代码服务")
@RequestMapping("/rest/xxYjrdwdm")
@RequestMapping("/rest/xxYjdwdm")
@RestController
@Validated
public class XxYjdwdmController {
......@@ -31,9 +32,9 @@ public class XxYjdwdmController {
}
@ApiOperation(value = "删除义警队伍数据")
@GetMapping("/delete")
public Integer delete(@RequestParam(name = "id") String id) {
return service.delete(id);
@PostMapping("/delete")
public Integer delete(@RequestBody @Validated CommonDelDTO dto) {
return service.delete(dto);
}
}
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxYjrwDTO;
import com.zksy.szpt.service.XxYjrwService;
import io.swagger.annotations.Api;
......@@ -31,9 +32,9 @@ public class XxYjrwController {
}
@ApiOperation(value = "删除义警任务信息数据")
@GetMapping("/delete")
public Integer delete(@RequestParam(name = "rwid") String rwid) {
return service.delete(rwid);
@PostMapping("/delete")
public Integer delete(@RequestBody @Validated CommonDelDTO dto) {
return service.delete(dto);
}
}
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxZhjfbgDTO;
import com.zksy.szpt.service.XxZhjfbgService;
import io.swagger.annotations.Api;
......@@ -32,9 +33,9 @@ public class XxZhjfbgController {
@ApiOperation(value = "删除账户积分变更数据")
@GetMapping("/delete")
public Integer delete(@RequestParam(name = "dhid") String dhid) {
return service.delete(dhid);
@PostMapping("/delete")
public Integer delete(@RequestBody @Validated CommonDelDTO dto) {
return service.delete(dto);
}
}
......@@ -32,9 +32,9 @@ public class XxZhxxController {
@ApiOperation(value = "删除账号信息数据")
@GetMapping("/delete")
public Integer delete(@RequestParam(name = "zhid") String zhid) {
return service.delete(zhid);
@PostMapping("/delete")
public Integer delete(@RequestBody @Validated CommonDelDTO dto) {
return service.delete(dto);
}
}
package com.zksy.szpt.domain.dto;
import javax.validation.constraints.NotEmpty;
import java.util.List;
public class CommonDelDTO {
/**
* 账户ID
*/
@NotEmpty(message = "账户ID不能为空")
private List<String> ids;
public @NotEmpty(message = "账户ID不能为空") List<String> getIds() {
return ids;
}
public void setIds(@NotEmpty(message = "账户ID不能为空") List<String> ids) {
this.ids = ids;
}
}
\ No newline at end of file
......@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxShxxyDwDTO;
import com.zksy.szpt.domain.po.XxShxxyDw;
import com.zksy.szpt.mapper.XxShxxyDwMapper;
......@@ -25,14 +26,14 @@ public class XxShxxyDwService {
public Integer update(XxShxxyDwDTO dto) {
XxShxxyDw xxZhxx = BeanMapperUtil.map(dto, XxShxxyDw.class);
LambdaUpdateWrapper<XxShxxyDw> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(XxShxxyDw::getId, xxZhxx.getId());
wrapper.eq(XxShxxyDw::getId, xxZhxx.getId());
return xxShxxyDwMapper.update(xxZhxx, wrapper);
}
public Integer delete(String id) {
public Integer delete(CommonDelDTO dto) {
LambdaQueryWrapper<XxShxxyDw> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XxShxxyDw::getId, id);
wrapper.in(XxShxxyDw::getId, dto.getIds());
return xxShxxyDwMapper.delete(wrapper);
}
}
......@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxShxxyDTO;
import com.zksy.szpt.domain.po.XxShxxy;
import com.zksy.szpt.mapper.XxShxxyMapper;
......@@ -25,14 +26,14 @@ public class XxShxxyService {
public Integer update(XxShxxyDTO dto) {
XxShxxy xxZhxx = BeanMapperUtil.map(dto, XxShxxy.class);
LambdaUpdateWrapper<XxShxxy> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(XxShxxy::getXxyid, xxZhxx.getXxyid());
wrapper.eq(XxShxxy::getXxyid, xxZhxx.getXxyid());
return xxShxxyMapper.update(xxZhxx,wrapper);
}
public Integer delete(String id) {
public Integer delete(CommonDelDTO dto ) {
LambdaQueryWrapper<XxShxxy> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XxShxxy::getXxyid, id);
wrapper.in(XxShxxy::getXxyid, dto.getIds());
return xxShxxyMapper.delete(wrapper);
}
}
......@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxYjdwdmDTO;
import com.zksy.szpt.domain.po.XxYjdwdm;
import com.zksy.szpt.mapper.XxYjdwdmMapper;
......@@ -24,14 +25,14 @@ public class XxYjdwdmService {
public Integer update(XxYjdwdmDTO dto) {
XxYjdwdm xxYjdwdm = BeanMapperUtil.map(dto, XxYjdwdm.class);
LambdaUpdateWrapper<XxYjdwdm> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(XxYjdwdm::getId, xxYjdwdm.getId());
wrapper.eq(XxYjdwdm::getId, xxYjdwdm.getId());
return xxYjdwdmMapper.update(xxYjdwdm,wrapper);
}
public Integer delete(String id) {
public Integer delete(CommonDelDTO dto) {
LambdaQueryWrapper<XxYjdwdm> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XxYjdwdm::getId, id);
wrapper.in(XxYjdwdm::getId, dto.getIds());
return xxYjdwdmMapper.delete(wrapper);
}
}
......@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxYjrwDTO;
import com.zksy.szpt.domain.po.XxYjrw;
import com.zksy.szpt.mapper.XxYjrwMapper;
......@@ -24,14 +25,14 @@ public class XxYjrwService {
public Integer update(XxYjrwDTO dto) {
XxYjrw xxYjrw = BeanMapperUtil.map(dto, XxYjrw.class);
LambdaUpdateWrapper<XxYjrw> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(XxYjrw::getRwid, xxYjrw.getRwid());
wrapper.eq(XxYjrw::getRwid, xxYjrw.getRwid());
return xxYjrwMapper.update(xxYjrw,wrapper);
}
public Integer delete(String id) {
public Integer delete(CommonDelDTO dto) {
LambdaQueryWrapper<XxYjrw> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XxYjrw::getRwid, id);
wrapper.in(XxYjrw::getRwid, dto.getIds());
return xxYjrwMapper.delete(wrapper);
}
}
......@@ -2,11 +2,13 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.XxZhjfbgDTO;
import com.zksy.szpt.domain.po.XxZhjfbg;
import com.zksy.szpt.mapper.XxZhjfbgMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
......@@ -24,14 +26,14 @@ public class XxZhjfbgService {
public Integer update(XxZhjfbgDTO dto) {
XxZhjfbg xxZhjfbg = BeanMapperUtil.map(dto, XxZhjfbg.class);
LambdaUpdateWrapper<XxZhjfbg> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(XxZhjfbg::getDhid, xxZhjfbg.getDhid());
wrapper.eq(XxZhjfbg::getDhid, xxZhjfbg.getDhid());
return xxZhjfbgMapper.update(xxZhjfbg,wrapper);
}
public Integer delete(String id) {
public Integer delete(CommonDelDTO dto) {
LambdaQueryWrapper<XxZhjfbg> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XxZhjfbg::getDhid, id);
wrapper.in(XxZhjfbg::getDhid, dto.getIds());
return xxZhjfbgMapper.delete(wrapper);
}
}
......@@ -23,14 +23,14 @@ public class XxZhxxService {
public Integer update(XxZhxxDTO xxZhxxDTO) {
XxZhxx xxZhxx = BeanMapperUtil.map(xxZhxxDTO, XxZhxx.class);
LambdaUpdateWrapper<XxZhxx> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(XxZhxx::getZhid, xxZhxx.getZhid());
wrapper.eq(XxZhxx::getZhid, xxZhxx.getZhid());
return xxZhxxMapper.update(xxZhxx,wrapper);
}
public Integer delete(String zhid) {
public Integer delete(CommonDelDTO dto) {
LambdaQueryWrapper<XxZhxx> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XxZhxx::getZhid, zhid);
wrapper.in(XxZhxx::getZhid, dto.getIds());
return xxZhxxMapper.delete(wrapper);
}
}
......@@ -18,8 +18,7 @@ import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import javax.annotation.Resource;
import java.util.Date;
import java.util.UUID;
import java.util.*;
/**
* A simple unit test
......@@ -37,6 +36,7 @@ public class MainTest {
@Resource
private AppStoreService appStoreService;
/**
* 任务完成情况
*/
......@@ -89,7 +89,7 @@ public class MainTest {
@DisplayName("任务完成情况")
public void xxRwwcqkTest1() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce=String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
// Assertions.fail(secretKey);
......@@ -134,7 +134,7 @@ public class MainTest {
@DisplayName("任务完成情况")
public void test1() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce=String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
// Assertions.fail(secretKey);
......@@ -223,7 +223,7 @@ public class MainTest {
@DisplayName("任务完成情况")
public void test4() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce=String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
// Assertions.fail(secretKey);
......@@ -252,7 +252,7 @@ public class MainTest {
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/addXxYjrw")
String response = webClient.post().uri("/rest/xxYjrw/update")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
......@@ -263,6 +263,7 @@ public class MainTest {
.block();
System.out.println(response);
}
/**
* 任务完成情况
*/
......@@ -270,7 +271,7 @@ public class MainTest {
@DisplayName("任务完成情况")
public void test5() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce=String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
// Assertions.fail(secretKey);
......@@ -280,8 +281,8 @@ public class MainTest {
dto.setDwlx(Integer.valueOf(1));
dto.setId("1");
dto.setMchid("11111");
// dto.setZt("1");
// dto.setYjdwmc("test");
dto.setZt("1");
dto.setYjdwmc("test");
String json = null;
try {
json = objectMapper.writeValueAsString(dto);
......@@ -298,7 +299,7 @@ public class MainTest {
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/addXxYjdwdm")
String response = webClient.post().uri("/rest/xxYjdwdm/update")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
......@@ -314,7 +315,7 @@ public class MainTest {
@DisplayName("任务完成情况")
public void test6() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce=String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
//请求参数
......@@ -338,7 +339,7 @@ public class MainTest {
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/addXxShxxyDw")
String response = webClient.post().uri("/rest/xxShxxyDw/update")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
......@@ -354,7 +355,7 @@ public class MainTest {
@DisplayName("任务完成情况")
public void test7() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce=String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
//请求参数
......@@ -379,7 +380,7 @@ public class MainTest {
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/addXxShxxy")
String response = webClient.post().uri("/rest/xxShxxy/update")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
......@@ -390,4 +391,61 @@ public class MainTest {
.block();
System.out.println(response);
}
@Test
@DisplayName("任务完成情况")
public void testdelete() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在,为空直接抛出异常不进行下一步测试,提高测试效率
//请求参数
String number = "1";
String[] str = new String[1];
str[0] = number;
String json = null;
List<String> ids = new ArrayList<>();
ids.add("1");
CommonDelDTO dto=new CommonDelDTO();
dto.setIds(ids);
try {
json = objectMapper.writeValueAsString(dto);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
// String url="xxShxxyDw/delete";
// String url="xxShxxy/delete";
// String url="xxYjdwdm/delete";
// String url="xxYjrw/delete";
//
String url="xxZhjfbg/delete";
//
// String url = "xxZhxx/delete";
String response = webClient.post().uri("/rest/" + url)
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(dto), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
}
}
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