Browse Source

20220126不连接gateway

ptos
zy_Java 4 years ago
parent
commit
16a5d02e07
  1. 52
      pom.xml
  2. 11
      src/main/java/com/ccsens/ptccsens/PtCcsensApplication.java
  3. 24
      src/main/java/com/ccsens/ptccsens/annotation/MustLogin.java
  4. 6
      src/main/java/com/ccsens/ptccsens/api/DebugController.java
  5. 2
      src/main/java/com/ccsens/ptccsens/api/MemberController.java
  6. 1
      src/main/java/com/ccsens/ptccsens/api/OcrController.java
  7. 2
      src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java
  8. 2
      src/main/java/com/ccsens/ptccsens/api/finance/FinanceController.java
  9. 138
      src/main/java/com/ccsens/ptccsens/aspect/MustLoginAspect.java
  10. 44
      src/main/java/com/ccsens/ptccsens/bean/po/ProTaskPlugin.java
  11. 260
      src/main/java/com/ccsens/ptccsens/bean/po/ProTaskPluginExample.java
  12. 11
      src/main/java/com/ccsens/ptccsens/service/ImportService.java
  13. 3
      src/main/java/com/ccsens/ptccsens/service/OcrService.java
  14. 2
      src/main/java/com/ccsens/ptccsens/service/TallService.java
  15. 9
      src/main/java/com/ccsens/ptccsens/util/Constant.java
  16. 2
      src/main/resources/mapper_dao/ProTaskPluginDao.xml
  17. 76
      src/main/resources/mapper_raw/ProTaskPluginMapper.xml
  18. 6
      src/main/resources/mbg.xml

52
pom.xml

@ -21,37 +21,13 @@
</parent>
<dependencies>
<!--cloud 工具类-->
<dependency>
<artifactId>cloudutil</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--TALL_SDK-->
<dependency>
<artifactId>tallsdk</artifactId>
<groupId>com.ccsensptos</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!--公用接口-->
<!--<dependency>
<artifactId>common</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>-->
<!--util 工具类-->
<dependency>
<groupId>com.ccsens</groupId>
<artifactId>util</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!--微信工具包-->
<dependency>
<artifactId>wechatutil</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>
<groupId>io.netty</groupId>
@ -92,12 +68,6 @@
<artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
<!--<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
@ -263,6 +233,10 @@
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
@ -279,22 +253,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.ccsens.ptccsens.PtCcsensApplication</mainClass>
<!--<skip>true</skip>-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

11
src/main/java/com/ccsens/ptccsens/PtCcsensApplication.java

@ -1,12 +1,9 @@
package com.ccsens.ptccsens;
import com.ccsens.cloudutil.ribbon.RibbonConfiguration;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.scheduling.annotation.EnableAsync;
@ -14,14 +11,14 @@ import org.springframework.scheduling.annotation.EnableAsync;
/**
* @author whj
*/
@MapperScan(basePackages = {"com.ccsens.ptccsens.persist.*","com.ccsens.common.persist.*"})
@MapperScan(basePackages = {"com.ccsens.ptccsens.persist.*"})
@ServletComponentScan
@EnableAsync
//开启断路器功能
@EnableCircuitBreaker
@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
//@EnableCircuitBreaker
//@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
@SpringBootApplication
@ComponentScan(basePackages = {"com.ccsens","com.ccsensptos"}, excludeFilters = { @ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value = RibbonConfiguration.class)})
@ComponentScan(basePackages = {"com.ccsens","com.ccsensptos"})
public class PtCcsensApplication {
public static void main(String[] args) {

24
src/main/java/com/ccsens/ptccsens/annotation/MustLogin.java

@ -0,0 +1,24 @@
package com.ccsens.ptccsens.annotation;
import java.lang.annotation.*;
/**
* @description: 用于标识方法需要登录获取userId
* 如果未登录直接返回用户未登录
* @author: wuHuiJuan
* @create: 2019/12/09 09:48
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface MustLogin {
/**
* -1 不处理
* 0: 数组
* 1List
* 2Set
* 3: Map
* */
byte type() default -1;
}

6
src/main/java/com/ccsens/ptccsens/api/DebugController.java

@ -1,6 +1,9 @@
package com.ccsens.ptccsens.api;
import com.ccsens.ptccsens.util.Constant;
import com.ccsens.util.JsonResponse;
import com.ccsensptos.tallsdk.bean.vo.TallPluginVo;
import com.ccsensptos.tallsdk.util.PluginUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@ -22,7 +25,8 @@ public class DebugController {
})
@RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse debug(HttpServletRequest request) throws Exception {
// TallPluginVo.BusinessPluginInfo pluginByCodeAndName = PluginUtil.getPluginByCodeAndName(Constant.BUSINESS_CODE, "MP-TALL任务名a1");
// System.out.println(pluginByCodeAndName);
return JsonResponse.newInstance().ok("测试");
}

2
src/main/java/com/ccsens/ptccsens/api/MemberController.java

@ -1,6 +1,6 @@
package com.ccsens.ptccsens.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.ptccsens.annotation.MustLogin;
import com.ccsens.ptccsens.bean.dto.DeliverDto;
import com.ccsens.ptccsens.bean.vo.DeliverVo;
import com.ccsens.ptccsens.service.IDeliverService;

1
src/main/java/com/ccsens/ptccsens/api/OcrController.java

@ -2,7 +2,6 @@ package com.ccsens.ptccsens.api;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.ImageUtil;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.ptccsens.bean.dto.ProjectFinanceDto;
import com.ccsens.ptccsens.bean.vo.OcrVo;
import com.ccsens.ptccsens.bean.vo.ProjectFinanceVo;

2
src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java

@ -1,6 +1,6 @@
package com.ccsens.ptccsens.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.ptccsens.annotation.MustLogin;
import com.ccsens.ptccsens.bean.dto.ProjectFinanceDto;
import com.ccsens.ptccsens.bean.vo.ProjectFinanceVo;
import com.ccsens.ptccsens.service.IProjectFinanceService;

2
src/main/java/com/ccsens/ptccsens/api/finance/FinanceController.java

@ -1,6 +1,6 @@
package com.ccsens.ptccsens.api.finance;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.ptccsens.annotation.MustLogin;
import com.ccsens.ptccsens.bean.dto.FinanceDto;
import com.ccsens.ptccsens.bean.vo.FinanceVo;
import com.ccsens.ptccsens.service.IFinanceService;

138
src/main/java/com/ccsens/ptccsens/aspect/MustLoginAspect.java

@ -0,0 +1,138 @@
package com.ccsens.ptccsens.aspect;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.ptccsens.annotation.MustLogin;
import com.ccsens.ptccsens.bean.po.ProUser;
import com.ccsens.ptccsens.persist.dao.UserDao;
import com.ccsens.ptccsens.util.Constant;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.WebConstant;
import com.ccsens.util.bean.dto.QueryDto;
import com.ccsensptos.tallsdk.bean.dto.TallTokenDto;
import com.ccsensptos.tallsdk.bean.vo.TallTokenVo;
import com.ccsensptos.tallsdk.util.TokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: wuHuiJuan
* @create: 2019/12/09 09:54
*/
@Order(0)
@Slf4j
@Aspect
@Component
public class MustLoginAspect {
@Resource
private UserDao userDao;
@Pointcut("@annotation(com.ccsens.ptccsens.annotation.MustLogin)")
public void loginAdvice(){}
@Around("loginAdvice()")
public Object around(ProceedingJoinPoint pjp) throws Throwable {
HttpServletRequest request = ((ServletRequestAttributes)
RequestContextHolder.getRequestAttributes()).getRequest();
final String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
Object[] args = pjp.getArgs();
QueryDto dto = args == null || args.length < 1 ? null : (QueryDto) args[0];
//获取userId
ProUser user = null;
if(StrUtil.isNotEmpty(authHeader)){
log.info("MustLogin————token:{}", authHeader);
//通过token查找用户信息
//TODO 根据token获取用户信息
TallTokenVo.UserIdByToken userByToken = TokenUtil.getUserByToken(new TallTokenDto.GetUserByToken(authHeader, Constant.APP_ID, Constant.APP_SECRET));
if(ObjectUtil.isNull(userByToken)){
return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
}
//通过手机号获取用户在服务内的userId
if(StrUtil.isNotBlank(userByToken.getPhone())){
user = userDao.getUserIdByPhone(userByToken.getPhone());
log.info("{}获取user:{}", authHeader, user);
}
}
Signature signature = pjp.getSignature();
MethodSignature methodSignature = (MethodSignature) signature;
Method targetMethod = methodSignature.getMethod();
MustLogin mustLoginAnnotation = targetMethod.getAnnotation(MustLogin.class);
fillSpecial(dto, mustLoginAnnotation);
//必须登录,未登录直接返回未登录相关信息
if (user == null) {
return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
}
// JSONObject json = JSONObject.parseObject(JSON.toJSONString(response.getData()));
// Long userId = json.getLong("id");
// String userName = json.getString("userName");
// String avatarUrl = json.getString("avatarUrl");
// String phone = json.getString("phone");
// if (userId == null || userId == 0) {
// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
// }
if (dto != null) {
dto.setUserId(user.getId());
dto.setPhone(user.getPhone());
}
Object result = pjp.proceed();
return result;
}
private void fillSpecial(QueryDto dto, MustLogin mustLoginAnnotation) {
if (mustLoginAnnotation == null) {
return;
}
if (dto != null && mustLoginAnnotation.type() > -1) {
switch (mustLoginAnnotation.type()) {
case 0:
Object obj = dto.getParam();
if (obj!= null && !obj.getClass().isArray()) {
Class<?> aClass = dto.getParam().getClass();
Object o = Array.newInstance(aClass, 1);
Array.set(o, 0, dto.getParam());
dto.setParam(o);
}
break;
case 1:
Object obj1 = dto.getParam();
if (obj1!= null && !(obj1 instanceof List)) {
ArrayList arrayList = new ArrayList();
arrayList.add(dto.getParam());
dto.setParam(arrayList);
}
break;
}
}
}
}

44
src/main/java/com/ccsens/ptccsens/bean/po/ProTaskPlugin.java

@ -16,6 +16,12 @@ public class ProTaskPlugin implements Serializable {
private Long pluginId;
private Long businessPluginId;
private String code;
private Byte pluginInner;
private Date createdAt;
private Date updatedAt;
@ -26,8 +32,6 @@ public class ProTaskPlugin implements Serializable {
private Integer rowspan;
private String code;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -78,6 +82,30 @@ public class ProTaskPlugin implements Serializable {
this.pluginId = pluginId;
}
public Long getBusinessPluginId() {
return businessPluginId;
}
public void setBusinessPluginId(Long businessPluginId) {
this.businessPluginId = businessPluginId;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code == null ? null : code.trim();
}
public Byte getPluginInner() {
return pluginInner;
}
public void setPluginInner(Byte pluginInner) {
this.pluginInner = pluginInner;
}
public Date getCreatedAt() {
return createdAt;
}
@ -118,14 +146,6 @@ public class ProTaskPlugin implements Serializable {
this.rowspan = rowspan;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code == null ? null : code.trim();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@ -138,12 +158,14 @@ public class ProTaskPlugin implements Serializable {
sb.append(", plginCol=").append(plginCol);
sb.append(", taskDetailId=").append(taskDetailId);
sb.append(", pluginId=").append(pluginId);
sb.append(", businessPluginId=").append(businessPluginId);
sb.append(", code=").append(code);
sb.append(", pluginInner=").append(pluginInner);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", colspan=").append(colspan);
sb.append(", rowspan=").append(rowspan);
sb.append(", code=").append(code);
sb.append("]");
return sb.toString();
}

260
src/main/java/com/ccsens/ptccsens/bean/po/ProTaskPluginExample.java

@ -475,6 +475,196 @@ public class ProTaskPluginExample {
return (Criteria) this;
}
public Criteria andBusinessPluginIdIsNull() {
addCriterion("business_plugin_id is null");
return (Criteria) this;
}
public Criteria andBusinessPluginIdIsNotNull() {
addCriterion("business_plugin_id is not null");
return (Criteria) this;
}
public Criteria andBusinessPluginIdEqualTo(Long value) {
addCriterion("business_plugin_id =", value, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdNotEqualTo(Long value) {
addCriterion("business_plugin_id <>", value, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdGreaterThan(Long value) {
addCriterion("business_plugin_id >", value, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdGreaterThanOrEqualTo(Long value) {
addCriterion("business_plugin_id >=", value, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdLessThan(Long value) {
addCriterion("business_plugin_id <", value, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdLessThanOrEqualTo(Long value) {
addCriterion("business_plugin_id <=", value, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdIn(List<Long> values) {
addCriterion("business_plugin_id in", values, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdNotIn(List<Long> values) {
addCriterion("business_plugin_id not in", values, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdBetween(Long value1, Long value2) {
addCriterion("business_plugin_id between", value1, value2, "businessPluginId");
return (Criteria) this;
}
public Criteria andBusinessPluginIdNotBetween(Long value1, Long value2) {
addCriterion("business_plugin_id not between", value1, value2, "businessPluginId");
return (Criteria) this;
}
public Criteria andCodeIsNull() {
addCriterion("code is null");
return (Criteria) this;
}
public Criteria andCodeIsNotNull() {
addCriterion("code is not null");
return (Criteria) this;
}
public Criteria andCodeEqualTo(String value) {
addCriterion("code =", value, "code");
return (Criteria) this;
}
public Criteria andCodeNotEqualTo(String value) {
addCriterion("code <>", value, "code");
return (Criteria) this;
}
public Criteria andCodeGreaterThan(String value) {
addCriterion("code >", value, "code");
return (Criteria) this;
}
public Criteria andCodeGreaterThanOrEqualTo(String value) {
addCriterion("code >=", value, "code");
return (Criteria) this;
}
public Criteria andCodeLessThan(String value) {
addCriterion("code <", value, "code");
return (Criteria) this;
}
public Criteria andCodeLessThanOrEqualTo(String value) {
addCriterion("code <=", value, "code");
return (Criteria) this;
}
public Criteria andCodeLike(String value) {
addCriterion("code like", value, "code");
return (Criteria) this;
}
public Criteria andCodeNotLike(String value) {
addCriterion("code not like", value, "code");
return (Criteria) this;
}
public Criteria andCodeIn(List<String> values) {
addCriterion("code in", values, "code");
return (Criteria) this;
}
public Criteria andCodeNotIn(List<String> values) {
addCriterion("code not in", values, "code");
return (Criteria) this;
}
public Criteria andCodeBetween(String value1, String value2) {
addCriterion("code between", value1, value2, "code");
return (Criteria) this;
}
public Criteria andCodeNotBetween(String value1, String value2) {
addCriterion("code not between", value1, value2, "code");
return (Criteria) this;
}
public Criteria andPluginInnerIsNull() {
addCriterion("plugin_inner is null");
return (Criteria) this;
}
public Criteria andPluginInnerIsNotNull() {
addCriterion("plugin_inner is not null");
return (Criteria) this;
}
public Criteria andPluginInnerEqualTo(Byte value) {
addCriterion("plugin_inner =", value, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerNotEqualTo(Byte value) {
addCriterion("plugin_inner <>", value, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerGreaterThan(Byte value) {
addCriterion("plugin_inner >", value, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerGreaterThanOrEqualTo(Byte value) {
addCriterion("plugin_inner >=", value, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerLessThan(Byte value) {
addCriterion("plugin_inner <", value, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerLessThanOrEqualTo(Byte value) {
addCriterion("plugin_inner <=", value, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerIn(List<Byte> values) {
addCriterion("plugin_inner in", values, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerNotIn(List<Byte> values) {
addCriterion("plugin_inner not in", values, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerBetween(Byte value1, Byte value2) {
addCriterion("plugin_inner between", value1, value2, "pluginInner");
return (Criteria) this;
}
public Criteria andPluginInnerNotBetween(Byte value1, Byte value2) {
addCriterion("plugin_inner not between", value1, value2, "pluginInner");
return (Criteria) this;
}
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
@ -774,76 +964,6 @@ public class ProTaskPluginExample {
addCriterion("rowspan not between", value1, value2, "rowspan");
return (Criteria) this;
}
public Criteria andCodeIsNull() {
addCriterion("code is null");
return (Criteria) this;
}
public Criteria andCodeIsNotNull() {
addCriterion("code is not null");
return (Criteria) this;
}
public Criteria andCodeEqualTo(String value) {
addCriterion("code =", value, "code");
return (Criteria) this;
}
public Criteria andCodeNotEqualTo(String value) {
addCriterion("code <>", value, "code");
return (Criteria) this;
}
public Criteria andCodeGreaterThan(String value) {
addCriterion("code >", value, "code");
return (Criteria) this;
}
public Criteria andCodeGreaterThanOrEqualTo(String value) {
addCriterion("code >=", value, "code");
return (Criteria) this;
}
public Criteria andCodeLessThan(String value) {
addCriterion("code <", value, "code");
return (Criteria) this;
}
public Criteria andCodeLessThanOrEqualTo(String value) {
addCriterion("code <=", value, "code");
return (Criteria) this;
}
public Criteria andCodeLike(String value) {
addCriterion("code like", value, "code");
return (Criteria) this;
}
public Criteria andCodeNotLike(String value) {
addCriterion("code not like", value, "code");
return (Criteria) this;
}
public Criteria andCodeIn(List<String> values) {
addCriterion("code in", values, "code");
return (Criteria) this;
}
public Criteria andCodeNotIn(List<String> values) {
addCriterion("code not in", values, "code");
return (Criteria) this;
}
public Criteria andCodeBetween(String value1, String value2) {
addCriterion("code between", value1, value2, "code");
return (Criteria) this;
}
public Criteria andCodeNotBetween(String value1, String value2) {
addCriterion("code not between", value1, value2, "code");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

11
src/main/java/com/ccsens/ptccsens/service/ImportService.java

@ -18,7 +18,9 @@ import com.ccsens.util.StringUtil;
import com.ccsens.util.cron.CronConstant;
import com.ccsens.util.cron.NatureToDate;
import com.ccsens.util.exception.BaseException;
import com.ccsensptos.tallsdk.bean.vo.TallPluginVo;
import com.ccsensptos.tallsdk.bean.vo.TallProjectVo;
import com.ccsensptos.tallsdk.util.PluginUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
@ -753,11 +755,18 @@ public class ImportService implements IImportService {
// if(ObjectUtil.isNull(pluginId)){
// throw new BaseException(BasicsCodeError.PLUGIN_NAME_ERROR.addMsg(wbsSheet.getSheetName(),errorRow,plugin));
// }
TallPluginVo.BusinessPluginInfo pluginByCodeAndName = PluginUtil.getPluginByCodeAndName(Constant.BUSINESS_CODE, plugin);
if(ObjectUtil.isNull(pluginByCodeAndName)){
throw new BaseException(BasicsCodeError.PLUGIN_NAME_ERROR.addMsg(wbsSheet.getSheetName(),errorRow,plugin));
}
//添加插件
ProTaskPlugin proTaskPlugin = new ProTaskPlugin();
proTaskPlugin.setId(snowflake.nextId());
proTaskPlugin.setTaskDetailId(taskId);
// proTaskPlugin.setPluginId(pluginId);
proTaskPlugin.setPluginId(pluginByCodeAndName.getPluginId());
proTaskPlugin.setBusinessPluginId(pluginByCodeAndName.getBusinessPluginId());
proTaskPlugin.setCode(pluginByCodeAndName.getCode());
proTaskPlugin.setPluginInner(pluginByCodeAndName.getInner());
proTaskPlugin.setPlginRow(row);
proTaskPlugin.setPlginCol(1);
proTaskPlugin.setRowspan(1);

3
src/main/java/com/ccsens/ptccsens/service/OcrService.java

@ -2,11 +2,8 @@ package com.ccsens.ptccsens.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.druid.sql.visitor.functions.If;
import com.ccsens.ptccsens.bean.vo.OcrVo;
import com.ccsens.ptccsens.util.BasicsConstant;
import com.ccsens.util.RestTemplateUtil;
import com.ccsens.util.baidu.BaiDuDto;
import com.ccsens.util.baidu.BaiDuUtil;
import com.ccsens.util.baidu.BaiDuVo;

2
src/main/java/com/ccsens/ptccsens/service/TallService.java

@ -210,7 +210,7 @@ public class TallService implements ITallService {
@SneakyThrows
@Override
public TallProjectVo.ProjectInfo importWbs(String token, MultipartFile params) {
// //TODO 根据token获取用户信息
//TODO 根据token获取用户信息
TallTokenVo.UserIdByToken userByToken = TokenUtil.getUserByToken(new TallTokenDto.GetUserByToken(token, Constant.APP_ID, Constant.APP_SECRET));
//通过手机号获取用户在服务内的userId

9
src/main/java/com/ccsens/ptccsens/util/Constant.java

@ -12,13 +12,8 @@ public class Constant {
public static String APP_ID = "1485881608842252289";
/**secret*/
public static String APP_SECRET = "UzCCJfmKfVueCPw8w7ymbIc9vxZaRih4ndPmH38TnM9Wz54C";
/**零号项目Id*/
public static Long ZERO_PROJECT_ID = 1484800783814889472L;
/**引导页任务名*/
public static String ZERO_GUIDE = "引导页";
/**广告页任务名*/
public static String ZERO_ADVERTISING = "广告页";
/**服务code*/
public static String BUSINESS_CODE = "PT";
public static Map<Integer, String> timeUnit = new HashMap<>();
public static Map<Integer, String> timeFormat = new HashMap<>();

2
src/main/resources/mapper_dao/ProTaskPluginDao.xml

@ -31,7 +31,9 @@
<select id="queryTaskOfPlugin" resultType="com.ccsensptos.tallsdk.bean.vo.TallTaskVo$TaskPluginInfo">
SELECT
tp.plugin_id AS pluginId,
tp.business_plugin_id AS businessPluginId,
tp.code AS pluginCode,
tp.plugin_inner AS `inner`,
tp.param As param,
tp.plgin_row AS `row`,
tp.plgin_col AS col,

76
src/main/resources/mapper_raw/ProTaskPluginMapper.xml

@ -8,12 +8,14 @@
<result column="plgin_col" jdbcType="INTEGER" property="plginCol" />
<result column="task_detail_id" jdbcType="BIGINT" property="taskDetailId" />
<result column="plugin_id" jdbcType="BIGINT" property="pluginId" />
<result column="business_plugin_id" jdbcType="BIGINT" property="businessPluginId" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="plugin_inner" jdbcType="TINYINT" property="pluginInner" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="colspan" jdbcType="INTEGER" property="colspan" />
<result column="rowspan" jdbcType="INTEGER" property="rowspan" />
<result column="code" jdbcType="VARCHAR" property="code" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -74,8 +76,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, param, plgin_row, plgin_col, task_detail_id, plugin_id, created_at, updated_at,
rec_status, colspan, rowspan, code
id, param, plgin_row, plgin_col, task_detail_id, plugin_id, business_plugin_id, code,
plugin_inner, created_at, updated_at, rec_status, colspan, rowspan
</sql>
<select id="selectByExample" parameterType="com.ccsens.ptccsens.bean.po.ProTaskPluginExample" resultMap="BaseResultMap">
select
@ -110,14 +112,14 @@
<insert id="insert" parameterType="com.ccsens.ptccsens.bean.po.ProTaskPlugin">
insert into t_pro_task_plugin (id, param, plgin_row,
plgin_col, task_detail_id, plugin_id,
business_plugin_id, code, plugin_inner,
created_at, updated_at, rec_status,
colspan, rowspan, code
)
colspan, rowspan)
values (#{id,jdbcType=BIGINT}, #{param,jdbcType=VARCHAR}, #{plginRow,jdbcType=INTEGER},
#{plginCol,jdbcType=INTEGER}, #{taskDetailId,jdbcType=BIGINT}, #{pluginId,jdbcType=BIGINT},
#{businessPluginId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{pluginInner,jdbcType=TINYINT},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT},
#{colspan,jdbcType=INTEGER}, #{rowspan,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}
)
#{colspan,jdbcType=INTEGER}, #{rowspan,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.ptccsens.bean.po.ProTaskPlugin">
insert into t_pro_task_plugin
@ -140,6 +142,15 @@
<if test="pluginId != null">
plugin_id,
</if>
<if test="businessPluginId != null">
business_plugin_id,
</if>
<if test="code != null">
code,
</if>
<if test="pluginInner != null">
plugin_inner,
</if>
<if test="createdAt != null">
created_at,
</if>
@ -155,9 +166,6 @@
<if test="rowspan != null">
rowspan,
</if>
<if test="code != null">
code,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -178,6 +186,15 @@
<if test="pluginId != null">
#{pluginId,jdbcType=BIGINT},
</if>
<if test="businessPluginId != null">
#{businessPluginId,jdbcType=BIGINT},
</if>
<if test="code != null">
#{code,jdbcType=VARCHAR},
</if>
<if test="pluginInner != null">
#{pluginInner,jdbcType=TINYINT},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
@ -193,9 +210,6 @@
<if test="rowspan != null">
#{rowspan,jdbcType=INTEGER},
</if>
<if test="code != null">
#{code,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.ptccsens.bean.po.ProTaskPluginExample" resultType="java.lang.Long">
@ -225,6 +239,15 @@
<if test="record.pluginId != null">
plugin_id = #{record.pluginId,jdbcType=BIGINT},
</if>
<if test="record.businessPluginId != null">
business_plugin_id = #{record.businessPluginId,jdbcType=BIGINT},
</if>
<if test="record.code != null">
code = #{record.code,jdbcType=VARCHAR},
</if>
<if test="record.pluginInner != null">
plugin_inner = #{record.pluginInner,jdbcType=TINYINT},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
@ -240,9 +263,6 @@
<if test="record.rowspan != null">
rowspan = #{record.rowspan,jdbcType=INTEGER},
</if>
<if test="record.code != null">
code = #{record.code,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -256,12 +276,14 @@
plgin_col = #{record.plginCol,jdbcType=INTEGER},
task_detail_id = #{record.taskDetailId,jdbcType=BIGINT},
plugin_id = #{record.pluginId,jdbcType=BIGINT},
business_plugin_id = #{record.businessPluginId,jdbcType=BIGINT},
code = #{record.code,jdbcType=VARCHAR},
plugin_inner = #{record.pluginInner,jdbcType=TINYINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT},
colspan = #{record.colspan,jdbcType=INTEGER},
rowspan = #{record.rowspan,jdbcType=INTEGER},
code = #{record.code,jdbcType=VARCHAR}
rowspan = #{record.rowspan,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -284,6 +306,15 @@
<if test="pluginId != null">
plugin_id = #{pluginId,jdbcType=BIGINT},
</if>
<if test="businessPluginId != null">
business_plugin_id = #{businessPluginId,jdbcType=BIGINT},
</if>
<if test="code != null">
code = #{code,jdbcType=VARCHAR},
</if>
<if test="pluginInner != null">
plugin_inner = #{pluginInner,jdbcType=TINYINT},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
@ -299,9 +330,6 @@
<if test="rowspan != null">
rowspan = #{rowspan,jdbcType=INTEGER},
</if>
<if test="code != null">
code = #{code,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@ -312,12 +340,14 @@
plgin_col = #{plginCol,jdbcType=INTEGER},
task_detail_id = #{taskDetailId,jdbcType=BIGINT},
plugin_id = #{pluginId,jdbcType=BIGINT},
business_plugin_id = #{businessPluginId,jdbcType=BIGINT},
code = #{code,jdbcType=VARCHAR},
plugin_inner = #{pluginInner,jdbcType=TINYINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
colspan = #{colspan,jdbcType=INTEGER},
rowspan = #{rowspan,jdbcType=INTEGER},
code = #{code,jdbcType=VARCHAR}
rowspan = #{rowspan,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

6
src/main/resources/mbg.xml

@ -21,7 +21,7 @@
<!--数据库连接的信息:驱动类、连接地址、用户名、密码 -->
<jdbcConnection driverClass="com.mysql.jdbc.Driver"
connectionURL="jdbc:mysql://test.tall.wiki:3306/pt_ccsens?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
connectionURL="jdbc:mysql://101.201.226.163:3306/pt_ccsens?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
userId="root"
password="po3OynBO[M3579p6L7)o">
</jdbcConnection>
@ -82,8 +82,8 @@
<!-- <table tableName="t_pro_task_flow" domainObjectName="ProTaskFlow"></table>-->
<!-- <table tableName="t_pro_task_notify" domainObjectName="ProTaskNotify"></table>-->
<!-- <table tableName="t_pro_task_panel_info" domainObjectName="ProTaskPanelInfo"></table>-->
<table tableName="t_pro_user" domainObjectName="ProUser"> </table>
<!-- <table tableName="t_pro_task_plugin" domainObjectName="ProTaskPlugin"> </table>-->
<!-- <table tableName="t_pro_user" domainObjectName="ProUser"> </table>-->
<table tableName="t_pro_task_plugin" domainObjectName="ProTaskPlugin"> </table>
<!-- <table tableName="t_pro_task_process" domainObjectName="ProTaskProcess"></table>-->
<!-- <table tableName="t_pro_task_share" domainObjectName="ProTaskShare"></table>-->
<!-- <table tableName="t_pro_task_status_record" domainObjectName="ProTaskStatusRecord"></table>-->

Loading…
Cancel
Save