Skip to content

谢明辉 / vion-label

Go to a project
Commit 847cd936 by xmh
Options

一些修改

1 parent a2c8aede
Inline Side-by-side
Showing 19 changed files with 715 additions and 297 deletions
label-core/src/main/java/com/viontech/label/core/constant/SubTaskStatus.java
...@@ -20,7 +20,10 @@ public enum SubTaskStatus { ...@@ -20,7 +20,10 @@ public enum SubTaskStatus {
/** 审核驳回 */ /** 审核驳回 */
reject(5), reject(5),
/** 审核通过 */ /** 审核通过 */
VERIFY_PASSED(6); VERIFY_PASSED(6),
/** 低质量 */
LOW_QUALITY(7),
;
public int val; public int val;
SubTaskStatus(int val) { SubTaskStatus(int val) {
......
label-platform/src/main/java/com/viontech/label/platform/controller/base/AccountBaseController.java
...@@ -7,6 +7,7 @@ import com.viontech.label.platform.model.Account; ...@@ -7,6 +7,7 @@ import com.viontech.label.platform.model.Account;
import com.viontech.label.platform.model.AccountExample; import com.viontech.label.platform.model.AccountExample;
import com.viontech.label.platform.service.adapter.AccountService; import com.viontech.label.platform.service.adapter.AccountService;
import com.viontech.label.platform.vo.AccountVo; import com.viontech.label.platform.vo.AccountVo;
import javax.annotation.Resource; import javax.annotation.Resource;
public abstract class AccountBaseController extends BaseController<Account, AccountVo> { public abstract class AccountBaseController extends BaseController<Account, AccountVo> {
...@@ -17,126 +18,144 @@ public abstract class AccountBaseController extends BaseController<Account, Acco ...@@ -17,126 +18,144 @@ public abstract class AccountBaseController extends BaseController<Account, Acco
protected BaseExample getExample(AccountVo accountVo, int type) { protected BaseExample getExample(AccountVo accountVo, int type) {
AccountExample accountExample = new AccountExample(); AccountExample accountExample = new AccountExample();
AccountExample.Criteria criteria = accountExample.createCriteria(); AccountExample.Criteria criteria = accountExample.createCriteria();
if(accountVo.getId() != null) { if (accountVo.getId() != null) {
criteria.andIdEqualTo(accountVo.getId()); criteria.andIdEqualTo(accountVo.getId());
} }
if(accountVo.getId_arr() != null) { if (accountVo.getId_arr() != null) {
criteria.andIdIn(accountVo.getId_arr()); criteria.andIdIn(accountVo.getId_arr());
} }
if(accountVo.getId_gt() != null) { if (accountVo.getId_gt() != null) {
criteria.andIdGreaterThan(accountVo.getId_gt()); criteria.andIdGreaterThan(accountVo.getId_gt());
} }
if(accountVo.getId_lt() != null) { if (accountVo.getId_lt() != null) {
criteria.andIdLessThan(accountVo.getId_lt()); criteria.andIdLessThan(accountVo.getId_lt());
} }
if(accountVo.getId_gte() != null) { if (accountVo.getId_gte() != null) {
criteria.andIdGreaterThanOrEqualTo(accountVo.getId_gte()); criteria.andIdGreaterThanOrEqualTo(accountVo.getId_gte());
} }
if(accountVo.getId_lte() != null) { if (accountVo.getId_lte() != null) {
criteria.andIdLessThanOrEqualTo(accountVo.getId_lte()); criteria.andIdLessThanOrEqualTo(accountVo.getId_lte());
} }
if(accountVo.getUnid() != null) { if (accountVo.getUnid() != null) {
criteria.andUnidEqualTo(accountVo.getUnid()); criteria.andUnidEqualTo(accountVo.getUnid());
} }
if(accountVo.getUnid_arr() != null) { if (accountVo.getUnid_arr() != null) {
criteria.andUnidIn(accountVo.getUnid_arr()); criteria.andUnidIn(accountVo.getUnid_arr());
} }
if(accountVo.getUnid_like() != null) { if (accountVo.getUnid_like() != null) {
criteria.andUnidLike(accountVo.getUnid_like()); criteria.andUnidLike(accountVo.getUnid_like());
} }
if(accountVo.getCreateTime() != null) { if (accountVo.getCreateTime() != null) {
criteria.andCreateTimeEqualTo(accountVo.getCreateTime()); criteria.andCreateTimeEqualTo(accountVo.getCreateTime());
} }
if(accountVo.getCreateTime_arr() != null) { if (accountVo.getCreateTime_arr() != null) {
criteria.andCreateTimeIn(accountVo.getCreateTime_arr()); criteria.andCreateTimeIn(accountVo.getCreateTime_arr());
} }
if(accountVo.getCreateTime_gt() != null) { if (accountVo.getCreateTime_gt() != null) {
criteria.andCreateTimeGreaterThan(accountVo.getCreateTime_gt()); criteria.andCreateTimeGreaterThan(accountVo.getCreateTime_gt());
} }
if(accountVo.getCreateTime_lt() != null) { if (accountVo.getCreateTime_lt() != null) {
criteria.andCreateTimeLessThan(accountVo.getCreateTime_lt()); criteria.andCreateTimeLessThan(accountVo.getCreateTime_lt());
} }
if(accountVo.getCreateTime_gte() != null) { if (accountVo.getCreateTime_gte() != null) {
criteria.andCreateTimeGreaterThanOrEqualTo(accountVo.getCreateTime_gte()); criteria.andCreateTimeGreaterThanOrEqualTo(accountVo.getCreateTime_gte());
} }
if(accountVo.getCreateTime_lte() != null) { if (accountVo.getCreateTime_lte() != null) {
criteria.andCreateTimeLessThanOrEqualTo(accountVo.getCreateTime_lte()); criteria.andCreateTimeLessThanOrEqualTo(accountVo.getCreateTime_lte());
} }
if(accountVo.getCreateUser() != null) { if (accountVo.getCreateUser() != null) {
criteria.andCreateUserEqualTo(accountVo.getCreateUser()); criteria.andCreateUserEqualTo(accountVo.getCreateUser());
} }
if(accountVo.getCreateUser_null() != null) { if (accountVo.getCreateUser_null() != null) {
if(accountVo.getCreateUser_null().booleanValue()) { if (accountVo.getCreateUser_null().booleanValue()) {
criteria.andCreateUserIsNull(); criteria.andCreateUserIsNull();
} else { } else {
criteria.andCreateUserIsNotNull(); criteria.andCreateUserIsNotNull();
} }
} }
if(accountVo.getCreateUser_arr() != null) { if (accountVo.getCreateUser_arr() != null) {
criteria.andCreateUserIn(accountVo.getCreateUser_arr()); criteria.andCreateUserIn(accountVo.getCreateUser_arr());
} }
if(accountVo.getCreateUser_gt() != null) { if (accountVo.getCreateUser_gt() != null) {
criteria.andCreateUserGreaterThan(accountVo.getCreateUser_gt()); criteria.andCreateUserGreaterThan(accountVo.getCreateUser_gt());
} }
if(accountVo.getCreateUser_lt() != null) { if (accountVo.getCreateUser_lt() != null) {
criteria.andCreateUserLessThan(accountVo.getCreateUser_lt()); criteria.andCreateUserLessThan(accountVo.getCreateUser_lt());
} }
if(accountVo.getCreateUser_gte() != null) { if (accountVo.getCreateUser_gte() != null) {
criteria.andCreateUserGreaterThanOrEqualTo(accountVo.getCreateUser_gte()); criteria.andCreateUserGreaterThanOrEqualTo(accountVo.getCreateUser_gte());
} }
if(accountVo.getCreateUser_lte() != null) { if (accountVo.getCreateUser_lte() != null) {
criteria.andCreateUserLessThanOrEqualTo(accountVo.getCreateUser_lte()); criteria.andCreateUserLessThanOrEqualTo(accountVo.getCreateUser_lte());
} }
if(accountVo.getName() != null) { if (accountVo.getName() != null) {
criteria.andNameEqualTo(accountVo.getName()); criteria.andNameEqualTo(accountVo.getName());
} }
if(accountVo.getName_arr() != null) { if (accountVo.getName_arr() != null) {
criteria.andNameIn(accountVo.getName_arr()); criteria.andNameIn(accountVo.getName_arr());
} }
if(accountVo.getName_like() != null) { if (accountVo.getName_like() != null) {
criteria.andNameLike(accountVo.getName_like()); criteria.andNameLike(accountVo.getName_like());
} }
if(accountVo.getManagerId() != null) { if (accountVo.getManagerId() != null) {
criteria.andManagerIdEqualTo(accountVo.getManagerId()); criteria.andManagerIdEqualTo(accountVo.getManagerId());
} }
if(accountVo.getManagerId_null() != null) { if (accountVo.getManagerId_null() != null) {
if(accountVo.getManagerId_null().booleanValue()) { if (accountVo.getManagerId_null().booleanValue()) {
criteria.andManagerIdIsNull(); criteria.andManagerIdIsNull();
} else { } else {
criteria.andManagerIdIsNotNull(); criteria.andManagerIdIsNotNull();
} }
} }
if(accountVo.getManagerId_arr() != null) { if (accountVo.getManagerId_arr() != null) {
criteria.andManagerIdIn(accountVo.getManagerId_arr()); criteria.andManagerIdIn(accountVo.getManagerId_arr());
} }
if(accountVo.getManagerId_gt() != null) { if (accountVo.getManagerId_gt() != null) {
criteria.andManagerIdGreaterThan(accountVo.getManagerId_gt()); criteria.andManagerIdGreaterThan(accountVo.getManagerId_gt());
} }
if(accountVo.getManagerId_lt() != null) { if (accountVo.getManagerId_lt() != null) {
criteria.andManagerIdLessThan(accountVo.getManagerId_lt()); criteria.andManagerIdLessThan(accountVo.getManagerId_lt());
} }
if(accountVo.getManagerId_gte() != null) { if (accountVo.getManagerId_gte() != null) {
criteria.andManagerIdGreaterThanOrEqualTo(accountVo.getManagerId_gte()); criteria.andManagerIdGreaterThanOrEqualTo(accountVo.getManagerId_gte());
} }
if(accountVo.getManagerId_lte() != null) { if (accountVo.getManagerId_lte() != null) {
criteria.andManagerIdLessThanOrEqualTo(accountVo.getManagerId_lte()); criteria.andManagerIdLessThanOrEqualTo(accountVo.getManagerId_lte());
} }
if(accountVo.getDescription() != null) { if (accountVo.getDescription() != null) {
criteria.andDescriptionEqualTo(accountVo.getDescription()); criteria.andDescriptionEqualTo(accountVo.getDescription());
} }
if(accountVo.getDescription_null() != null) { if (accountVo.getDescription_null() != null) {
if(accountVo.getDescription_null().booleanValue()) { if (accountVo.getDescription_null().booleanValue()) {
criteria.andDescriptionIsNull(); criteria.andDescriptionIsNull();
} else { } else {
criteria.andDescriptionIsNotNull(); criteria.andDescriptionIsNotNull();
} }
} }
if(accountVo.getDescription_arr() != null) { if (accountVo.getDescription_arr() != null) {
criteria.andDescriptionIn(accountVo.getDescription_arr()); criteria.andDescriptionIn(accountVo.getDescription_arr());
} }
if(accountVo.getDescription_like() != null) { if (accountVo.getDescription_like() != null) {
criteria.andDescriptionLike(accountVo.getDescription_like()); criteria.andDescriptionLike(accountVo.getDescription_like());
} }
if (accountVo.getStatus() != null) {
criteria.andStatusEqualTo(accountVo.getStatus());
}
if (accountVo.getStatus_arr() != null) {
criteria.andStatusIn(accountVo.getStatus_arr());
}
if (accountVo.getStatus_gt() != null) {
criteria.andStatusGreaterThan(accountVo.getStatus_gt());
}
if (accountVo.getStatus_lt() != null) {
criteria.andStatusLessThan(accountVo.getStatus_lt());
}
if (accountVo.getStatus_gte() != null) {
criteria.andStatusGreaterThanOrEqualTo(accountVo.getStatus_gte());
}
if (accountVo.getStatus_lte() != null) {
criteria.andStatusLessThanOrEqualTo(accountVo.getStatus_lte());
}
return accountExample; return accountExample;
} }
......
label-platform/src/main/java/com/viontech/label/platform/controller/base/SubTaskBaseController.java
...@@ -106,6 +106,24 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT ...@@ -106,6 +106,24 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT
if (subTaskVo.getPicId_lte() != null) { if (subTaskVo.getPicId_lte() != null) {
criteria.andPicIdLessThanOrEqualTo(subTaskVo.getPicId_lte()); criteria.andPicIdLessThanOrEqualTo(subTaskVo.getPicId_lte());
} }
if (subTaskVo.getPackId() != null) {
criteria.andPackIdEqualTo(subTaskVo.getPackId());
}
if (subTaskVo.getPackId_arr() != null) {
criteria.andPackIdIn(subTaskVo.getPackId_arr());
}
if (subTaskVo.getPackId_gt() != null) {
criteria.andPackIdGreaterThan(subTaskVo.getPackId_gt());
}
if (subTaskVo.getPackId_lt() != null) {
criteria.andPackIdLessThan(subTaskVo.getPackId_lt());
}
if (subTaskVo.getPackId_gte() != null) {
criteria.andPackIdGreaterThanOrEqualTo(subTaskVo.getPackId_gte());
}
if (subTaskVo.getPackId_lte() != null) {
criteria.andPackIdLessThanOrEqualTo(subTaskVo.getPackId_lte());
}
if (subTaskVo.getTaskId() != null) { if (subTaskVo.getTaskId() != null) {
criteria.andTaskIdEqualTo(subTaskVo.getTaskId()); criteria.andTaskIdEqualTo(subTaskVo.getTaskId());
} }
...@@ -294,6 +312,31 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT ...@@ -294,6 +312,31 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT
if (subTaskVo.getStatus_lte() != null) { if (subTaskVo.getStatus_lte() != null) {
criteria.andStatusLessThanOrEqualTo(subTaskVo.getStatus_lte()); criteria.andStatusLessThanOrEqualTo(subTaskVo.getStatus_lte());
} }
if (subTaskVo.getDirection() != null) {
criteria.andDirectionEqualTo(subTaskVo.getDirection());
}
if (subTaskVo.getDirection_null() != null) {
if (subTaskVo.getDirection_null().booleanValue()) {
criteria.andDirectionIsNull();
} else {
criteria.andDirectionIsNotNull();
}
}
if (subTaskVo.getDirection_arr() != null) {
criteria.andDirectionIn(subTaskVo.getDirection_arr());
}
if (subTaskVo.getDirection_gt() != null) {
criteria.andDirectionGreaterThan(subTaskVo.getDirection_gt());
}
if (subTaskVo.getDirection_lt() != null) {
criteria.andDirectionLessThan(subTaskVo.getDirection_lt());
}
if (subTaskVo.getDirection_gte() != null) {
criteria.andDirectionGreaterThanOrEqualTo(subTaskVo.getDirection_gte());
}
if (subTaskVo.getDirection_lte() != null) {
criteria.andDirectionLessThanOrEqualTo(subTaskVo.getDirection_lte());
}
if (subTaskVo.getPersonUnid() != null) { if (subTaskVo.getPersonUnid() != null) {
criteria.andPersonUnidEqualTo(subTaskVo.getPersonUnid()); criteria.andPersonUnidEqualTo(subTaskVo.getPersonUnid());
} }
...@@ -310,31 +353,6 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT ...@@ -310,31 +353,6 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT
if (subTaskVo.getPersonUnid_like() != null) { if (subTaskVo.getPersonUnid_like() != null) {
criteria.andPersonUnidLike(subTaskVo.getPersonUnid_like()); criteria.andPersonUnidLike(subTaskVo.getPersonUnid_like());
} }
if (subTaskVo.getPackId() != null) {
criteria.andPackIdEqualTo(subTaskVo.getPackId());
}
if (subTaskVo.getPackId_null() != null) {
if (subTaskVo.getPackId_null().booleanValue()) {
criteria.andPackIdIsNull();
} else {
criteria.andPackIdIsNotNull();
}
}
if (subTaskVo.getPackId_arr() != null) {
criteria.andPackIdIn(subTaskVo.getPackId_arr());
}
if (subTaskVo.getPackId_gt() != null) {
criteria.andPackIdGreaterThan(subTaskVo.getPackId_gt());
}
if (subTaskVo.getPackId_lt() != null) {
criteria.andPackIdLessThan(subTaskVo.getPackId_lt());
}
if (subTaskVo.getPackId_gte() != null) {
criteria.andPackIdGreaterThanOrEqualTo(subTaskVo.getPackId_gte());
}
if (subTaskVo.getPackId_lte() != null) {
criteria.andPackIdLessThanOrEqualTo(subTaskVo.getPackId_lte());
}
return subTaskExample; return subTaskExample;
} }
......
label-platform/src/main/java/com/viontech/label/platform/controller/web/PackController.java
package com.viontech.label.platform.controller.web; package com.viontech.label.platform.controller.web;
import com.github.pagehelper.PageInfo;
import com.viontech.keliu.util.JsonMessageUtil; import com.viontech.keliu.util.JsonMessageUtil;
import com.viontech.label.platform.base.BaseExample; import com.viontech.label.platform.base.BaseExample;
import com.viontech.label.platform.controller.base.PackBaseController; import com.viontech.label.platform.controller.base.PackBaseController;
...@@ -10,15 +11,14 @@ import com.viontech.label.platform.model.entity.PackInfo; ...@@ -10,15 +11,14 @@ import com.viontech.label.platform.model.entity.PackInfo;
import com.viontech.label.platform.service.adapter.UserService; import com.viontech.label.platform.service.adapter.UserService;
import com.viontech.label.platform.vo.PackVo; import com.viontech.label.platform.vo.PackVo;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.viontech.keliu.util.JsonMessageUtil.getSuccessJsonMsg;
@Controller @Controller
@RequestMapping("/packs") @RequestMapping("/packs")
public class PackController extends PackBaseController { public class PackController extends PackBaseController {
...@@ -34,7 +34,8 @@ public class PackController extends PackBaseController { ...@@ -34,7 +34,8 @@ public class PackController extends PackBaseController {
packExample.createTaskColumns(); packExample.createTaskColumns();
User currentUser = userService.getCurrentUser(); User currentUser = userService.getCurrentUser();
if (!currentUser.getType().equals(0)) { // 类型为管理员和内部质检员 可以查看所有的 pack
if (!currentUser.getType().equals(0) && !currentUser.getType().equals(2)) {
packExample.andTaskCriteria().andAccountIdEqualTo(currentUser.getAccountId()); packExample.andTaskCriteria().andAccountIdEqualTo(currentUser.getAccountId());
} }
...@@ -48,6 +49,30 @@ public class PackController extends PackBaseController { ...@@ -48,6 +49,30 @@ public class PackController extends PackBaseController {
return JsonMessageUtil.getSuccessJsonMsg(info); return JsonMessageUtil.getSuccessJsonMsg(info);
} }
@Override
@RequestMapping(value = "", method = RequestMethod.GET)
@ResponseBody
public Object page(PackVo packVo, @RequestParam(value = "page", defaultValue = "-1") int page, @RequestParam(value = "pageSize", defaultValue = "100") int pageSize, String sortName, String sortOrder) {
PackExample baseExample = (PackExample) getExample(packVo, EXAMPLE_TYPE_PAGE);
if (packVo.getAccountId() != null) {
baseExample.andTaskCriteria().andAccountIdEqualTo(packVo.getAccountId());
}
if (isNotNull(sortOrder) && isNotNull(sortName)) {
baseExample.setOrderByClause(baseExample.getTableAlias() + "." + sortName + " " + sortOrder);
} else if (isNotNull(sortName) && !isNotNull(sortOrder)) {
baseExample.setOrderByClause(sortName);
}
if (page <= 0) {
List result = getService().selectByExample(baseExample);
return getSuccessJsonMsg(MESSAGE_SELECT_SUCCESS, result);
} else {
PageInfo pageInfo = getService().pagedQuery(baseExample, page, pageSize);
return getSuccessJsonMsg(MESSAGE_PAGE_SUCCESS, pageInfo);
}
}
@GetMapping("/assignTo") @GetMapping("/assignTo")
@ResponseBody @ResponseBody
public JsonMessageUtil.JsonMessage assignTo(@RequestParam Long[] packIds, @RequestParam(required = false) Long taskId) { public JsonMessageUtil.JsonMessage assignTo(@RequestParam Long[] packIds, @RequestParam(required = false) Long taskId) {
......
label-platform/src/main/java/com/viontech/label/platform/controller/web/ReidController.java
...@@ -11,10 +11,12 @@ import com.viontech.label.platform.mapper.LogMapper; ...@@ -11,10 +11,12 @@ import com.viontech.label.platform.mapper.LogMapper;
import com.viontech.label.platform.mapper.SubTaskMapper; import com.viontech.label.platform.mapper.SubTaskMapper;
import com.viontech.label.platform.model.SubTask; import com.viontech.label.platform.model.SubTask;
import com.viontech.label.platform.model.SubTaskExample; import com.viontech.label.platform.model.SubTaskExample;
import com.viontech.label.platform.model.User;
import com.viontech.label.platform.service.adapter.SubTaskService; import com.viontech.label.platform.service.adapter.SubTaskService;
import com.viontech.label.platform.service.main.ReidService; import com.viontech.label.platform.service.main.ReidService;
import com.viontech.label.platform.vo.LogVo; import com.viontech.label.platform.vo.LogVo;
import com.viontech.label.platform.vo.ReidUploadData; import com.viontech.label.platform.vo.ReidUploadData;
import com.viontech.label.platform.vo.SubTaskVo;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -55,21 +57,27 @@ public class ReidController { ...@@ -55,21 +57,27 @@ public class ReidController {
*/ */
@GetMapping("/getPeople") @GetMapping("/getPeople")
public Object getPeople(@RequestParam Long packId, @RequestParam(required = false) Integer status public Object getPeople(@RequestParam Long packId, @RequestParam(required = false) Integer status
, @RequestParam(required = false) Long page, @RequestParam(required = false) Long size , @RequestParam(required = false) Long page, @RequestParam(required = false) Long size, @RequestParam(required = false) Long annotatorId
, @RequestParam(defaultValue = "1") Integer countGTE, @RequestParam(defaultValue = "10000") Integer countLTE) { , @RequestParam(defaultValue = "1") Integer countGTE, @RequestParam(defaultValue = "10000") Integer countLTE) {
SubTaskMapper mapper = (SubTaskMapper) subTaskService.getMapper(); SubTaskMapper mapper = (SubTaskMapper) subTaskService.getMapper();
List<SubTask> people = mapper.getPeople(packId, status, page == null ? null : (page - 1) * size, size, countGTE, countLTE); List<SubTaskVo> people = mapper.getPeople(packId, status, page == null ? null : (page - 1) * size, size, annotatorId, countGTE, countLTE);
LinkedHashMap<String, List<SubTask>> temp = new LinkedHashMap<>(); LinkedHashMap<String, List<SubTaskVo>> temp = new LinkedHashMap<>();
for (SubTask item : people) { Map<String, User> labelingMap = reidService.getRedissonClient().<String, User>getMap("labeling:" + packId).readAllMap();
List<SubTask> list = temp.computeIfAbsent(item.getPersonUnid(), x -> new LinkedList<>());
for (SubTaskVo item : people) {
String personUnid = item.getPersonUnid();
List<SubTaskVo> list = temp.computeIfAbsent(personUnid, x -> new LinkedList<>());
list.add(item); list.add(item);
if (labelingMap.containsKey(personUnid)) {
item.setLabelUserName(labelingMap.get(personUnid).getName());
}
} }
if (page != null) { if (page != null) {
PageInfo<Object> pageInfo = new PageInfo<>(new ArrayList<>(temp.entrySet()), page.intValue()); PageInfo<Object> pageInfo = new PageInfo<>(new ArrayList<>(temp.entrySet()), page.intValue());
pageInfo.setTotal(mapper.countPeople(packId, status, countGTE, countLTE)); pageInfo.setTotal(mapper.countPeople(packId, status, annotatorId, countGTE, countLTE));
return JsonMessageUtil.getSuccessJsonMsg(pageInfo); return JsonMessageUtil.getSuccessJsonMsg(pageInfo);
} else { } else {
return JsonMessageUtil.getSuccessJsonMsg(temp); return JsonMessageUtil.getSuccessJsonMsg(temp);
......
label-platform/src/main/java/com/viontech/label/platform/mapper/SubTaskMapper.java
...@@ -3,6 +3,7 @@ package com.viontech.label.platform.mapper; ...@@ -3,6 +3,7 @@ package com.viontech.label.platform.mapper;
import com.viontech.label.platform.base.BaseMapper; import com.viontech.label.platform.base.BaseMapper;
import com.viontech.label.platform.model.SubTask; import com.viontech.label.platform.model.SubTask;
import com.viontech.label.platform.model.SubTaskExample; import com.viontech.label.platform.model.SubTaskExample;
import com.viontech.label.platform.vo.SubTaskVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
...@@ -54,31 +55,37 @@ public interface SubTaskMapper extends BaseMapper { ...@@ -54,31 +55,37 @@ public interface SubTaskMapper extends BaseMapper {
void mergeTo(Collection<Long> idCollection, String personUnid); void mergeTo(Collection<Long> idCollection, String personUnid);
@Select("<script>" + @Select("<script>" +
"select id,unid,create_time as createTime,pack_id as packId,pic_id as picId,task_id as taskId,person_unid as personUnid,status from d_sub_task where pack_id=#{packId} and person_unid in " + "select d_sub_task.id,d_sub_task.unid,d_sub_task.create_time as createTime,pack_id as packId," +
"pic_id as picId,task_id as taskId,person_unid as personUnid,d_sub_task.status,s_user.name as labelUserName " +
"from d_sub_task left join s_user on annotator_id=s_user.id where pack_id=#{packId} and person_unid in " +
"(select person_unid from d_sub_task where pack_id=#{packId}" + "(select person_unid from d_sub_task where pack_id=#{packId}" +
" <if test = 'status != null'> and status=#{status}</if> " + " <if test = 'status != null'> and status=#{status}</if> " +
" <if test = 'status == null'> and status != -1</if> " + " <if test = 'status == null'> and status != -1</if> " +
" <if test = 'annotatorId != null'> and annotator_id = #{annotatorId}</if> " +
"group by person_unid " + "group by person_unid " +
" having count(*) between #{countGTE} and #{countLTE} " + " having count(*) between #{countGTE} and #{countLTE} " +
" order by person_unid " + " order by person_unid " +
"<if test='offset != null'> offset #{offset} limit #{limit}</if>) " + "<if test='offset != null'> offset #{offset} limit #{limit}</if>) " +
" order by person_unid " + " order by person_unid " +
"</script>") "</script>")
List<SubTask> getPeople(Long packId, Integer status, Long offset, Long limit, Integer countGTE, Integer countLTE); List<SubTaskVo> getPeople(Long packId, Integer status, Long offset, Long limit, Long annotatorId, Integer countGTE, Integer countLTE);
@Select("<script>" + @Select("<script>" +
"select count(*) from " + "select count(*) from " +
"(select person_unid from d_sub_task where pack_id=#{packId}" + "(select person_unid from d_sub_task where pack_id=#{packId}" +
" <if test = 'status != null'> and status=#{status}</if> " + " <if test = 'status != null'> and status=#{status}</if> " +
" <if test = 'status == null'> and status != -1</if> " + " <if test = 'status == null'> and status != -1</if> " +
" <if test = 'annotatorId != null'> and annotator_id = #{annotatorId}</if> " +
" group by person_unid " + " group by person_unid " +
" having count(*) between #{countGTE} and #{countLTE} " + " having count(*) between #{countGTE} and #{countLTE} " +
") as t " + ") as t " +
"</script>") "</script>")
int countPeople(Long packId, Integer status, Integer countGTE, Integer countLTE); int countPeople(Long packId, Integer status, Long annotatorId, Integer countGTE, Integer countLTE);
@Select("<script>" + @Select("<script>" +
"select id,unid,create_time as createTime,pack_id as packId,pic_id as picId,task_id as taskId,person_unid as personUnid,status from d_sub_task where pack_id=#{packId} and person_unid=" + "select d_sub_task.id,d_sub_task.unid,d_sub_task.create_time as createTime,pack_id as packId," +
"pic_id as picId,task_id as taskId,person_unid as personUnid,d_sub_task.status,s_user.name as labelUserName " +
"from d_sub_task left join s_user on annotator_id=s_user.id where pack_id=#{packId} and person_unid=" +
"(select person_unid from d_sub_task where pack_id=#{packId} " + "(select person_unid from d_sub_task where pack_id=#{packId} " +
"<if test = 'status != null'> and status=#{status}</if>" + "<if test = 'status != null'> and status=#{status}</if>" +
" <if test = 'status == null'> and status != -1</if> " + " <if test = 'status == null'> and status != -1</if> " +
......
label-platform/src/main/java/com/viontech/label/platform/mapping/AccountMapper.xml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<result column="account_name" property="name" /> <result column="account_name" property="name" />
<result column="account_manager_id" property="managerId" /> <result column="account_manager_id" property="managerId" />
<result column="account_description" property="description" /> <result column="account_description" property="description" />
<result column="account_status" property="status" />
</resultMap> </resultMap>
<resultMap id="BaseResultMap" type="com.viontech.label.platform.model.Account" extends="BaseResultMapRoot" /> <resultMap id="BaseResultMap" type="com.viontech.label.platform.model.Account" extends="BaseResultMapRoot" />
<sql id="Example_Where_Clause" > <sql id="Example_Where_Clause" >
...@@ -72,7 +73,8 @@ ...@@ -72,7 +73,8 @@
<sql id="Base_Column_List_Root" > <sql id="Base_Column_List_Root" >
"account".id as account_id, "account".unid as account_unid, "account".create_time as account_create_time, "account".id as account_id, "account".unid as account_unid, "account".create_time as account_create_time,
"account".create_user as account_create_user, "account"."name" as "account_name", "account".create_user as account_create_user, "account"."name" as "account_name",
"account".manager_id as account_manager_id, "account".description as account_description "account".manager_id as account_manager_id, "account".description as account_description,
"account"."status" as "account_status"
</sql> </sql>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
<if test="!(_parameter.getClass().getSimpleName() == 'AccountExample')" > <if test="!(_parameter.getClass().getSimpleName() == 'AccountExample')" >
...@@ -128,11 +130,11 @@ ...@@ -128,11 +130,11 @@
</delete> </delete>
<insert id="insert" parameterType="com.viontech.label.platform.model.Account" useGeneratedKeys="true" keyProperty="id" keyColumn="id" > <insert id="insert" parameterType="com.viontech.label.platform.model.Account" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
insert into "s_account" (unid, create_time, create_user, insert into "s_account" (unid, create_time, create_user,
"name", manager_id, description "name", manager_id, description,
) "status")
values (#{unid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=BIGINT}, values (#{unid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR}, #{managerId,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR} #{name,jdbcType=VARCHAR}, #{managerId,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR},
) #{status,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="com.viontech.label.platform.model.Account" useGeneratedKeys="true" keyProperty="id" keyColumn="id" > <insert id="insertSelective" parameterType="com.viontech.label.platform.model.Account" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
insert into "s_account" insert into "s_account"
...@@ -155,6 +157,9 @@ ...@@ -155,6 +157,9 @@
<if test="description != null" > <if test="description != null" >
description, description,
</if> </if>
<if test="status != null" >
"status",
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="unid != null" > <if test="unid != null" >
...@@ -175,6 +180,9 @@ ...@@ -175,6 +180,9 @@
<if test="description != null" > <if test="description != null" >
#{description,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
</if> </if>
<if test="status != null" >
#{status,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.viontech.label.platform.model.AccountExample" resultType="java.lang.Integer" > <select id="countByExample" parameterType="com.viontech.label.platform.model.AccountExample" resultType="java.lang.Integer" >
...@@ -207,6 +215,9 @@ ...@@ -207,6 +215,9 @@
<if test="record.description != null" > <if test="record.description != null" >
description = #{record.description,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR},
</if> </if>
<if test="record.status != null" >
"status" = #{record.status,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null" > <if test="_parameter != null" >
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -220,7 +231,8 @@ ...@@ -220,7 +231,8 @@
create_user = #{record.createUser,jdbcType=BIGINT}, create_user = #{record.createUser,jdbcType=BIGINT},
"name" = #{record.name,jdbcType=VARCHAR}, "name" = #{record.name,jdbcType=VARCHAR},
manager_id = #{record.managerId,jdbcType=BIGINT}, manager_id = #{record.managerId,jdbcType=BIGINT},
description = #{record.description,jdbcType=VARCHAR} description = #{record.description,jdbcType=VARCHAR},
"status" = #{record.status,jdbcType=INTEGER}
<if test="_parameter != null" > <if test="_parameter != null" >
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -246,6 +258,9 @@ ...@@ -246,6 +258,9 @@
<if test="description != null" > <if test="description != null" >
description = #{description,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR},
</if> </if>
<if test="status != null" >
"status" = #{status,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -256,7 +271,8 @@ ...@@ -256,7 +271,8 @@
create_user = #{createUser,jdbcType=BIGINT}, create_user = #{createUser,jdbcType=BIGINT},
"name" = #{name,jdbcType=VARCHAR}, "name" = #{name,jdbcType=VARCHAR},
manager_id = #{managerId,jdbcType=BIGINT}, manager_id = #{managerId,jdbcType=BIGINT},
description = #{description,jdbcType=VARCHAR} description = #{description,jdbcType=VARCHAR},
"status" = #{status,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file \ No newline at end of file
label-platform/src/main/java/com/viontech/label/platform/mapping/SubTaskMapper.xml
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<result column="subTask_create_time" property="createTime" /> <result column="subTask_create_time" property="createTime" />
<result column="subTask_create_user" property="createUser" /> <result column="subTask_create_user" property="createUser" />
<result column="subTask_pic_id" property="picId" /> <result column="subTask_pic_id" property="picId" />
<result column="subTask_pack_id" property="packId" />
<result column="subTask_task_id" property="taskId" /> <result column="subTask_task_id" property="taskId" />
<result column="subTask_in_inspector_id" property="inInspectorId" /> <result column="subTask_in_inspector_id" property="inInspectorId" />
<result column="subTask_out_inspector_id" property="outInspectorId" /> <result column="subTask_out_inspector_id" property="outInspectorId" />
...@@ -16,8 +17,8 @@ ...@@ -16,8 +17,8 @@
<result column="subTask_in_status" property="inStatus" /> <result column="subTask_in_status" property="inStatus" />
<result column="subTask_out_status" property="outStatus" /> <result column="subTask_out_status" property="outStatus" />
<result column="subTask_status" property="status" /> <result column="subTask_status" property="status" />
<result column="subTask_direction" property="direction" />
<result column="subTask_person_unid" property="personUnid" /> <result column="subTask_person_unid" property="personUnid" />
<result column="subTask_pack_id" property="packId" />
</resultMap> </resultMap>
<resultMap id="BaseResultMap" type="com.viontech.label.platform.model.SubTask" extends="BaseResultMapRoot" > <resultMap id="BaseResultMap" type="com.viontech.label.platform.model.SubTask" extends="BaseResultMapRoot" >
<result column="pic_id" property="pic.id" /> <result column="pic_id" property="pic.id" />
...@@ -116,12 +117,12 @@ ...@@ -116,12 +117,12 @@
<sql id="Base_Column_List_Root" > <sql id="Base_Column_List_Root" >
"subTask".id as subTask_id, "subTask".unid as subTask_unid, "subTask".create_time as subTask_create_time, "subTask".id as subTask_id, "subTask".unid as subTask_unid, "subTask".create_time as subTask_create_time,
"subTask".create_user as subTask_create_user, "subTask".pic_id as subTask_pic_id, "subTask".create_user as subTask_create_user, "subTask".pic_id as subTask_pic_id,
"subTask".task_id as subTask_task_id, "subTask".in_inspector_id as subTask_in_inspector_id, "subTask".pack_id as subTask_pack_id, "subTask".task_id as subTask_task_id, "subTask".in_inspector_id as subTask_in_inspector_id,
"subTask".out_inspector_id as subTask_out_inspector_id, "subTask".annotator_id as subTask_annotator_id, "subTask".out_inspector_id as subTask_out_inspector_id, "subTask".annotator_id as subTask_annotator_id,
"subTask".annotate_time as subTask_annotate_time, "subTask".label_result as subTask_label_result, "subTask".annotate_time as subTask_annotate_time, "subTask".label_result as subTask_label_result,
"subTask".in_status as subTask_in_status, "subTask".out_status as subTask_out_status, "subTask".in_status as subTask_in_status, "subTask".out_status as subTask_out_status,
"subTask"."status" as "subTask_status", "subTask".person_unid as subTask_person_unid, "subTask"."status" as "subTask_status", "subTask".direction as subTask_direction,
"subTask".pack_id as subTask_pack_id "subTask".person_unid as subTask_person_unid
</sql> </sql>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
<if test="!(_parameter.getClass().getSimpleName() == 'SubTaskExample')" > <if test="!(_parameter.getClass().getSimpleName() == 'SubTaskExample')" >
...@@ -194,17 +195,17 @@ ...@@ -194,17 +195,17 @@
</delete> </delete>
<insert id="insert" parameterType="com.viontech.label.platform.model.SubTask" useGeneratedKeys="true" keyProperty="id" keyColumn="id" > <insert id="insert" parameterType="com.viontech.label.platform.model.SubTask" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
insert into "d_sub_task" (unid, create_time, create_user, insert into "d_sub_task" (unid, create_time, create_user,
pic_id, task_id, in_inspector_id, pic_id, pack_id, task_id,
out_inspector_id, annotator_id, annotate_time, in_inspector_id, out_inspector_id, annotator_id,
label_result, in_status, out_status, annotate_time, label_result, in_status,
"status", person_unid, pack_id out_status, "status", direction,
) person_unid)
values (#{unid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=BIGINT}, values (#{unid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=BIGINT},
#{picId,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{inInspectorId,jdbcType=BIGINT}, #{picId,jdbcType=BIGINT}, #{packId,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT},
#{outInspectorId,jdbcType=BIGINT}, #{annotatorId,jdbcType=BIGINT}, #{annotateTime,jdbcType=TIMESTAMP}, #{inInspectorId,jdbcType=BIGINT}, #{outInspectorId,jdbcType=BIGINT}, #{annotatorId,jdbcType=BIGINT},
#{labelResult,jdbcType=VARCHAR}, #{inStatus,jdbcType=INTEGER}, #{outStatus,jdbcType=INTEGER}, #{annotateTime,jdbcType=TIMESTAMP}, #{labelResult,jdbcType=VARCHAR}, #{inStatus,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{personUnid,jdbcType=VARCHAR}, #{packId,jdbcType=BIGINT} #{outStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{direction,jdbcType=INTEGER},
) #{personUnid,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.viontech.label.platform.model.SubTask" useGeneratedKeys="true" keyProperty="id" keyColumn="id" > <insert id="insertSelective" parameterType="com.viontech.label.platform.model.SubTask" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
insert into "d_sub_task" insert into "d_sub_task"
...@@ -221,6 +222,9 @@ ...@@ -221,6 +222,9 @@
<if test="picId != null" > <if test="picId != null" >
pic_id, pic_id,
</if> </if>
<if test="packId != null" >
pack_id,
</if>
<if test="taskId != null" > <if test="taskId != null" >
task_id, task_id,
</if> </if>
...@@ -248,12 +252,12 @@ ...@@ -248,12 +252,12 @@
<if test="status != null" > <if test="status != null" >
"status", "status",
</if> </if>
<if test="direction != null" >
direction,
</if>
<if test="personUnid != null" > <if test="personUnid != null" >
person_unid, person_unid,
</if> </if>
<if test="packId != null" >
pack_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="unid != null" > <if test="unid != null" >
...@@ -268,6 +272,9 @@ ...@@ -268,6 +272,9 @@
<if test="picId != null" > <if test="picId != null" >
#{picId,jdbcType=BIGINT}, #{picId,jdbcType=BIGINT},
</if> </if>
<if test="packId != null" >
#{packId,jdbcType=BIGINT},
</if>
<if test="taskId != null" > <if test="taskId != null" >
#{taskId,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT},
</if> </if>
...@@ -295,12 +302,12 @@ ...@@ -295,12 +302,12 @@
<if test="status != null" > <if test="status != null" >
#{status,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
</if> </if>
<if test="direction != null" >
#{direction,jdbcType=INTEGER},
</if>
<if test="personUnid != null" > <if test="personUnid != null" >
#{personUnid,jdbcType=VARCHAR}, #{personUnid,jdbcType=VARCHAR},
</if> </if>
<if test="packId != null" >
#{packId,jdbcType=BIGINT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.viontech.label.platform.model.SubTaskExample" resultType="java.lang.Integer" > <select id="countByExample" parameterType="com.viontech.label.platform.model.SubTaskExample" resultType="java.lang.Integer" >
...@@ -328,6 +335,9 @@ ...@@ -328,6 +335,9 @@
<if test="record.picId != null" > <if test="record.picId != null" >
pic_id = #{record.picId,jdbcType=BIGINT}, pic_id = #{record.picId,jdbcType=BIGINT},
</if> </if>
<if test="record.packId != null" >
pack_id = #{record.packId,jdbcType=BIGINT},
</if>
<if test="record.taskId != null" > <if test="record.taskId != null" >
task_id = #{record.taskId,jdbcType=BIGINT}, task_id = #{record.taskId,jdbcType=BIGINT},
</if> </if>
...@@ -355,12 +365,12 @@ ...@@ -355,12 +365,12 @@
<if test="record.status != null" > <if test="record.status != null" >
"status" = #{record.status,jdbcType=INTEGER}, "status" = #{record.status,jdbcType=INTEGER},
</if> </if>
<if test="record.direction != null" >
direction = #{record.direction,jdbcType=INTEGER},
</if>
<if test="record.personUnid != null" > <if test="record.personUnid != null" >
person_unid = #{record.personUnid,jdbcType=VARCHAR}, person_unid = #{record.personUnid,jdbcType=VARCHAR},
</if> </if>
<if test="record.packId != null" >
pack_id = #{record.packId,jdbcType=BIGINT},
</if>
</set> </set>
<if test="_parameter != null" > <if test="_parameter != null" >
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -373,6 +383,7 @@ ...@@ -373,6 +383,7 @@
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
create_user = #{record.createUser,jdbcType=BIGINT}, create_user = #{record.createUser,jdbcType=BIGINT},
pic_id = #{record.picId,jdbcType=BIGINT}, pic_id = #{record.picId,jdbcType=BIGINT},
pack_id = #{record.packId,jdbcType=BIGINT},
task_id = #{record.taskId,jdbcType=BIGINT}, task_id = #{record.taskId,jdbcType=BIGINT},
in_inspector_id = #{record.inInspectorId,jdbcType=BIGINT}, in_inspector_id = #{record.inInspectorId,jdbcType=BIGINT},
out_inspector_id = #{record.outInspectorId,jdbcType=BIGINT}, out_inspector_id = #{record.outInspectorId,jdbcType=BIGINT},
...@@ -382,8 +393,8 @@ ...@@ -382,8 +393,8 @@
in_status = #{record.inStatus,jdbcType=INTEGER}, in_status = #{record.inStatus,jdbcType=INTEGER},
out_status = #{record.outStatus,jdbcType=INTEGER}, out_status = #{record.outStatus,jdbcType=INTEGER},
"status" = #{record.status,jdbcType=INTEGER}, "status" = #{record.status,jdbcType=INTEGER},
person_unid = #{record.personUnid,jdbcType=VARCHAR}, direction = #{record.direction,jdbcType=INTEGER},
pack_id = #{record.packId,jdbcType=BIGINT} person_unid = #{record.personUnid,jdbcType=VARCHAR}
<if test="_parameter != null" > <if test="_parameter != null" >
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -403,6 +414,9 @@ ...@@ -403,6 +414,9 @@
<if test="picId != null" > <if test="picId != null" >
pic_id = #{picId,jdbcType=BIGINT}, pic_id = #{picId,jdbcType=BIGINT},
</if> </if>
<if test="packId != null" >
pack_id = #{packId,jdbcType=BIGINT},
</if>
<if test="taskId != null" > <if test="taskId != null" >
task_id = #{taskId,jdbcType=BIGINT}, task_id = #{taskId,jdbcType=BIGINT},
</if> </if>
...@@ -430,12 +444,12 @@ ...@@ -430,12 +444,12 @@
<if test="status != null" > <if test="status != null" >
"status" = #{status,jdbcType=INTEGER}, "status" = #{status,jdbcType=INTEGER},
</if> </if>
<if test="direction != null" >
direction = #{direction,jdbcType=INTEGER},
</if>
<if test="personUnid != null" > <if test="personUnid != null" >
person_unid = #{personUnid,jdbcType=VARCHAR}, person_unid = #{personUnid,jdbcType=VARCHAR},
</if> </if>
<if test="packId != null" >
pack_id = #{packId,jdbcType=BIGINT},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -445,6 +459,7 @@ ...@@ -445,6 +459,7 @@
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
create_user = #{createUser,jdbcType=BIGINT}, create_user = #{createUser,jdbcType=BIGINT},
pic_id = #{picId,jdbcType=BIGINT}, pic_id = #{picId,jdbcType=BIGINT},
pack_id = #{packId,jdbcType=BIGINT},
task_id = #{taskId,jdbcType=BIGINT}, task_id = #{taskId,jdbcType=BIGINT},
in_inspector_id = #{inInspectorId,jdbcType=BIGINT}, in_inspector_id = #{inInspectorId,jdbcType=BIGINT},
out_inspector_id = #{outInspectorId,jdbcType=BIGINT}, out_inspector_id = #{outInspectorId,jdbcType=BIGINT},
...@@ -454,8 +469,8 @@ ...@@ -454,8 +469,8 @@
in_status = #{inStatus,jdbcType=INTEGER}, in_status = #{inStatus,jdbcType=INTEGER},
out_status = #{outStatus,jdbcType=INTEGER}, out_status = #{outStatus,jdbcType=INTEGER},
"status" = #{status,jdbcType=INTEGER}, "status" = #{status,jdbcType=INTEGER},
person_unid = #{personUnid,jdbcType=VARCHAR}, direction = #{direction,jdbcType=INTEGER},
pack_id = #{packId,jdbcType=BIGINT} person_unid = #{personUnid,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file \ No newline at end of file
label-platform/src/main/java/com/viontech/label/platform/model/Account.java
package com.viontech.label.platform.model; package com.viontech.label.platform.model;
import com.viontech.label.platform.base.BaseModel; import com.viontech.label.platform.base.BaseModel;
import java.util.Date; import java.util.Date;
public class Account extends BaseModel { public class Account extends BaseModel {
...@@ -19,6 +18,8 @@ public class Account extends BaseModel { ...@@ -19,6 +18,8 @@ public class Account extends BaseModel {
private String description; private String description;
private Integer status;
public Long getId() { public Long getId() {
return id; return id;
} }
...@@ -74,4 +75,12 @@ public class Account extends BaseModel { ...@@ -74,4 +75,12 @@ public class Account extends BaseModel {
public void setDescription(String description) { public void setDescription(String description) {
this.description = description == null ? null : description.trim(); this.description = description == null ? null : description.trim();
} }
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
} }
\ No newline at end of file \ No newline at end of file
label-platform/src/main/java/com/viontech/label/platform/model/AccountExample.java
package com.viontech.label.platform.model; package com.viontech.label.platform.model;
import com.viontech.label.platform.base.BaseExample; import com.viontech.label.platform.base.BaseExample;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
public class AccountExample extends BaseExample { public class AccountExample extends BaseExample {
...@@ -536,6 +538,66 @@ public class AccountExample extends BaseExample { ...@@ -536,6 +538,66 @@ public class AccountExample extends BaseExample {
addCriterion("\"account\".description not between", value1, value2, "description"); addCriterion("\"account\".description not between", value1, value2, "description");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusIsNull() {
addCriterion("\"account\".\"status\" is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("\"account\".\"status\" is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Integer value) {
addCriterion("\"account\".\"status\" =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Integer value) {
addCriterion("\"account\".\"status\" <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Integer value) {
addCriterion("\"account\".\"status\" >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("\"account\".\"status\" >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Integer value) {
addCriterion("\"account\".\"status\" <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Integer value) {
addCriterion("\"account\".\"status\" <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Integer> values) {
addCriterion("\"account\".\"status\" in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> values) {
addCriterion("\"account\".\"status\" not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Integer value1, Integer value2) {
addCriterion("\"account\".\"status\" between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Integer value1, Integer value2) {
addCriterion("\"account\".\"status\" not between", value1, value2, "status");
return (Criteria) this;
}
} }
public static class ColumnContainer extends ColumnContainerBase { public static class ColumnContainer extends ColumnContainerBase {
...@@ -578,5 +640,10 @@ public class AccountExample extends BaseExample { ...@@ -578,5 +640,10 @@ public class AccountExample extends BaseExample {
addColumnStr("\"account\".description as account_description "); addColumnStr("\"account\".description as account_description ");
return (ColumnContainer) this; return (ColumnContainer) this;
} }
public ColumnContainer hasStatusColumn() {
addColumnStr("\"account\".\"status\" as \"account_status\" ");
return (ColumnContainer) this;
}
} }
} }
\ No newline at end of file \ No newline at end of file
label-platform/src/main/java/com/viontech/label/platform/model/SubTask.java
...@@ -14,6 +14,8 @@ public class SubTask extends BaseModel { ...@@ -14,6 +14,8 @@ public class SubTask extends BaseModel {
private Long picId; private Long picId;
private Long packId;
private Long taskId; private Long taskId;
private Long inInspectorId; private Long inInspectorId;
...@@ -32,9 +34,9 @@ public class SubTask extends BaseModel { ...@@ -32,9 +34,9 @@ public class SubTask extends BaseModel {
private Integer status; private Integer status;
private String personUnid; private Integer direction;
private Long packId; private String personUnid;
private Pic pic; private Pic pic;
...@@ -80,6 +82,14 @@ public class SubTask extends BaseModel { ...@@ -80,6 +82,14 @@ public class SubTask extends BaseModel {
this.picId = picId; this.picId = picId;
} }
public Long getPackId() {
return packId;
}
public void setPackId(Long packId) {
this.packId = packId;
}
public Long getTaskId() { public Long getTaskId() {
return taskId; return taskId;
} }
...@@ -152,20 +162,20 @@ public class SubTask extends BaseModel { ...@@ -152,20 +162,20 @@ public class SubTask extends BaseModel {
this.status = status; this.status = status;
} }
public String getPersonUnid() { public Integer getDirection() {
return personUnid; return direction;
} }
public void setPersonUnid(String personUnid) { public void setDirection(Integer direction) {
this.personUnid = personUnid == null ? null : personUnid.trim(); this.direction = direction;
} }
public Long getPackId() { public String getPersonUnid() {
return packId; return personUnid;
} }
public void setPackId(Long packId) { public void setPersonUnid(String personUnid) {
this.packId = packId; this.personUnid = personUnid == null ? null : personUnid.trim();
} }
public Pic getPic() { public Pic getPic() {
......
label-platform/src/main/java/com/viontech/label/platform/model/SubTaskExample.java
...@@ -483,6 +483,66 @@ public class SubTaskExample extends BaseExample { ...@@ -483,6 +483,66 @@ public class SubTaskExample extends BaseExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdIsNull() {
addCriterion("\"subTask\".pack_id is null");
return (Criteria) this;
}
public Criteria andPackIdIsNotNull() {
addCriterion("\"subTask\".pack_id is not null");
return (Criteria) this;
}
public Criteria andPackIdEqualTo(Long value) {
addCriterion("\"subTask\".pack_id =", value, "packId");
return (Criteria) this;
}
public Criteria andPackIdNotEqualTo(Long value) {
addCriterion("\"subTask\".pack_id <>", value, "packId");
return (Criteria) this;
}
public Criteria andPackIdGreaterThan(Long value) {
addCriterion("\"subTask\".pack_id >", value, "packId");
return (Criteria) this;
}
public Criteria andPackIdGreaterThanOrEqualTo(Long value) {
addCriterion("\"subTask\".pack_id >=", value, "packId");
return (Criteria) this;
}
public Criteria andPackIdLessThan(Long value) {
addCriterion("\"subTask\".pack_id <", value, "packId");
return (Criteria) this;
}
public Criteria andPackIdLessThanOrEqualTo(Long value) {
addCriterion("\"subTask\".pack_id <=", value, "packId");
return (Criteria) this;
}
public Criteria andPackIdIn(List<Long> values) {
addCriterion("\"subTask\".pack_id in", values, "packId");
return (Criteria) this;
}
public Criteria andPackIdNotIn(List<Long> values) {
addCriterion("\"subTask\".pack_id not in", values, "packId");
return (Criteria) this;
}
public Criteria andPackIdBetween(Long value1, Long value2) {
addCriterion("\"subTask\".pack_id between", value1, value2, "packId");
return (Criteria) this;
}
public Criteria andPackIdNotBetween(Long value1, Long value2) {
addCriterion("\"subTask\".pack_id not between", value1, value2, "packId");
return (Criteria) this;
}
public Criteria andTaskIdIsNull() { public Criteria andTaskIdIsNull() {
addCriterion("\"subTask\".task_id is null"); addCriterion("\"subTask\".task_id is null");
return (Criteria) this; return (Criteria) this;
...@@ -1033,133 +1093,133 @@ public class SubTaskExample extends BaseExample { ...@@ -1033,133 +1093,133 @@ public class SubTaskExample extends BaseExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidIsNull() { public Criteria andDirectionIsNull() {
addCriterion("\"subTask\".person_unid is null"); addCriterion("\"subTask\".direction is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidIsNotNull() { public Criteria andDirectionIsNotNull() {
addCriterion("\"subTask\".person_unid is not null"); addCriterion("\"subTask\".direction is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidEqualTo(String value) { public Criteria andDirectionEqualTo(Integer value) {
addCriterion("\"subTask\".person_unid =", value, "personUnid"); addCriterion("\"subTask\".direction =", value, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidNotEqualTo(String value) { public Criteria andDirectionNotEqualTo(Integer value) {
addCriterion("\"subTask\".person_unid <>", value, "personUnid"); addCriterion("\"subTask\".direction <>", value, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidGreaterThan(String value) { public Criteria andDirectionGreaterThan(Integer value) {
addCriterion("\"subTask\".person_unid >", value, "personUnid"); addCriterion("\"subTask\".direction >", value, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidGreaterThanOrEqualTo(String value) { public Criteria andDirectionGreaterThanOrEqualTo(Integer value) {
addCriterion("\"subTask\".person_unid >=", value, "personUnid"); addCriterion("\"subTask\".direction >=", value, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidLessThan(String value) { public Criteria andDirectionLessThan(Integer value) {
addCriterion("\"subTask\".person_unid <", value, "personUnid"); addCriterion("\"subTask\".direction <", value, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidLessThanOrEqualTo(String value) { public Criteria andDirectionLessThanOrEqualTo(Integer value) {
addCriterion("\"subTask\".person_unid <=", value, "personUnid"); addCriterion("\"subTask\".direction <=", value, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidLike(String value) { public Criteria andDirectionIn(List<Integer> values) {
addCriterion("\"subTask\".person_unid like", value, "personUnid"); addCriterion("\"subTask\".direction in", values, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidNotLike(String value) { public Criteria andDirectionNotIn(List<Integer> values) {
addCriterion("\"subTask\".person_unid not like", value, "personUnid"); addCriterion("\"subTask\".direction not in", values, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidIn(List<String> values) { public Criteria andDirectionBetween(Integer value1, Integer value2) {
addCriterion("\"subTask\".person_unid in", values, "personUnid"); addCriterion("\"subTask\".direction between", value1, value2, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidNotIn(List<String> values) { public Criteria andDirectionNotBetween(Integer value1, Integer value2) {
addCriterion("\"subTask\".person_unid not in", values, "personUnid"); addCriterion("\"subTask\".direction not between", value1, value2, "direction");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidBetween(String value1, String value2) { public Criteria andPersonUnidIsNull() {
addCriterion("\"subTask\".person_unid between", value1, value2, "personUnid"); addCriterion("\"subTask\".person_unid is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPersonUnidNotBetween(String value1, String value2) { public Criteria andPersonUnidIsNotNull() {
addCriterion("\"subTask\".person_unid not between", value1, value2, "personUnid"); addCriterion("\"subTask\".person_unid is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdIsNull() { public Criteria andPersonUnidEqualTo(String value) {
addCriterion("\"subTask\".pack_id is null"); addCriterion("\"subTask\".person_unid =", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdIsNotNull() { public Criteria andPersonUnidNotEqualTo(String value) {
addCriterion("\"subTask\".pack_id is not null"); addCriterion("\"subTask\".person_unid <>", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdEqualTo(Long value) { public Criteria andPersonUnidGreaterThan(String value) {
addCriterion("\"subTask\".pack_id =", value, "packId"); addCriterion("\"subTask\".person_unid >", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdNotEqualTo(Long value) { public Criteria andPersonUnidGreaterThanOrEqualTo(String value) {
addCriterion("\"subTask\".pack_id <>", value, "packId"); addCriterion("\"subTask\".person_unid >=", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdGreaterThan(Long value) { public Criteria andPersonUnidLessThan(String value) {
addCriterion("\"subTask\".pack_id >", value, "packId"); addCriterion("\"subTask\".person_unid <", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdGreaterThanOrEqualTo(Long value) { public Criteria andPersonUnidLessThanOrEqualTo(String value) {
addCriterion("\"subTask\".pack_id >=", value, "packId"); addCriterion("\"subTask\".person_unid <=", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdLessThan(Long value) { public Criteria andPersonUnidLike(String value) {
addCriterion("\"subTask\".pack_id <", value, "packId"); addCriterion("\"subTask\".person_unid like", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdLessThanOrEqualTo(Long value) { public Criteria andPersonUnidNotLike(String value) {
addCriterion("\"subTask\".pack_id <=", value, "packId"); addCriterion("\"subTask\".person_unid not like", value, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdIn(List<Long> values) { public Criteria andPersonUnidIn(List<String> values) {
addCriterion("\"subTask\".pack_id in", values, "packId"); addCriterion("\"subTask\".person_unid in", values, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdNotIn(List<Long> values) { public Criteria andPersonUnidNotIn(List<String> values) {
addCriterion("\"subTask\".pack_id not in", values, "packId"); addCriterion("\"subTask\".person_unid not in", values, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdBetween(Long value1, Long value2) { public Criteria andPersonUnidBetween(String value1, String value2) {
addCriterion("\"subTask\".pack_id between", value1, value2, "packId"); addCriterion("\"subTask\".person_unid between", value1, value2, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackIdNotBetween(Long value1, Long value2) { public Criteria andPersonUnidNotBetween(String value1, String value2) {
addCriterion("\"subTask\".pack_id not between", value1, value2, "packId"); addCriterion("\"subTask\".person_unid not between", value1, value2, "personUnid");
return (Criteria) this; return (Criteria) this;
} }
} }
...@@ -1195,6 +1255,11 @@ public class SubTaskExample extends BaseExample { ...@@ -1195,6 +1255,11 @@ public class SubTaskExample extends BaseExample {
return (ColumnContainer) this; return (ColumnContainer) this;
} }
public ColumnContainer hasPackIdColumn() {
addColumnStr("\"subTask\".pack_id as subTask_pack_id ");
return (ColumnContainer) this;
}
public ColumnContainer hasTaskIdColumn() { public ColumnContainer hasTaskIdColumn() {
addColumnStr("\"subTask\".task_id as subTask_task_id "); addColumnStr("\"subTask\".task_id as subTask_task_id ");
return (ColumnContainer) this; return (ColumnContainer) this;
...@@ -1240,13 +1305,13 @@ public class SubTaskExample extends BaseExample { ...@@ -1240,13 +1305,13 @@ public class SubTaskExample extends BaseExample {
return (ColumnContainer) this; return (ColumnContainer) this;
} }
public ColumnContainer hasPersonUnidColumn() { public ColumnContainer hasDirectionColumn() {
addColumnStr("\"subTask\".person_unid as subTask_person_unid "); addColumnStr("\"subTask\".direction as subTask_direction ");
return (ColumnContainer) this; return (ColumnContainer) this;
} }
public ColumnContainer hasPackIdColumn() { public ColumnContainer hasPersonUnidColumn() {
addColumnStr("\"subTask\".pack_id as subTask_pack_id "); addColumnStr("\"subTask\".person_unid as subTask_person_unid ");
return (ColumnContainer) this; return (ColumnContainer) this;
} }
} }
......
label-platform/src/main/java/com/viontech/label/platform/service/main/ReidService.java
...@@ -106,6 +106,7 @@ public class ReidService { ...@@ -106,6 +106,7 @@ public class ReidService {
subTask.setCreateTime(data.getCountTime()); subTask.setCreateTime(data.getCountTime());
subTask.setTaskId(taskId == null ? data.getTaskId() : taskId); subTask.setTaskId(taskId == null ? data.getTaskId() : taskId);
subTask.setStatus(SubTaskStatus.TO_BE_LABELED.val); subTask.setStatus(SubTaskStatus.TO_BE_LABELED.val);
subTask.setDirection(data.getDirection());
subTaskService.insertSelective(subTask); subTaskService.insertSelective(subTask);
...@@ -864,4 +865,8 @@ public class ReidService { ...@@ -864,4 +865,8 @@ public class ReidService {
this.userService = userService; this.userService = userService;
return this; return this;
} }
public RedissonClient getRedissonClient() {
return redissonClient;
}
} }
label-platform/src/main/java/com/viontech/label/platform/vo/ReidUploadData.java
...@@ -23,5 +23,6 @@ public class ReidUploadData { ...@@ -23,5 +23,6 @@ public class ReidUploadData {
private String personUnid; private String personUnid;
private Date countTime; private Date countTime;
private Long taskId; private Long taskId;
private Integer direction;
} }
label-platform/src/main/java/com/viontech/label/platform/vo/SubTaskVo.java
...@@ -6,6 +6,7 @@ import com.viontech.label.platform.vobase.SubTaskVoBase; ...@@ -6,6 +6,7 @@ import com.viontech.label.platform.vobase.SubTaskVoBase;
public class SubTaskVo extends SubTaskVoBase { public class SubTaskVo extends SubTaskVoBase {
private boolean group; private boolean group;
private String labelUserName;
public SubTaskVo() { public SubTaskVo() {
super(); super();
...@@ -23,4 +24,13 @@ public class SubTaskVo extends SubTaskVoBase { ...@@ -23,4 +24,13 @@ public class SubTaskVo extends SubTaskVoBase {
this.group = group; this.group = group;
return this; return this;
} }
public String getLabelUserName() {
return labelUserName;
}
public SubTaskVo setLabelUserName(String labelUserName) {
this.labelUserName = labelUserName;
return this;
}
} }
\ No newline at end of file \ No newline at end of file
label-platform/src/main/java/com/viontech/label/platform/vobase/AccountVoBase.java
...@@ -97,12 +97,27 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -97,12 +97,27 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
@JsonIgnore @JsonIgnore
private String description_like; private String description_like;
@JsonIgnore
private ArrayList<Integer> status_arr;
@JsonIgnore
private Integer status_gt;
@JsonIgnore
private Integer status_lt;
@JsonIgnore
private Integer status_gte;
@JsonIgnore
private Integer status_lte;
public AccountVoBase() { public AccountVoBase() {
this(null); this(null);
} }
public AccountVoBase(Account account) { public AccountVoBase(Account account) {
if(account == null) { if (account == null) {
account = new Account(); account = new Account();
} }
this.account = account; this.account = account;
...@@ -158,14 +173,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -158,14 +173,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public Long getId() { public Long getId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getId(); return this.getModel().getId();
} }
public void setId(Long id) { public void setId(Long id) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setId(id); this.getModel().setId(id);
...@@ -188,14 +203,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -188,14 +203,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public String getUnid() { public String getUnid() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getUnid(); return this.getModel().getUnid();
} }
public void setUnid(String unid) { public void setUnid(String unid) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setUnid(unid); this.getModel().setUnid(unid);
...@@ -242,14 +257,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -242,14 +257,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public Date getCreateTime() { public Date getCreateTime() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getCreateTime(); return this.getModel().getCreateTime();
} }
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setCreateTime(createTime); this.getModel().setCreateTime(createTime);
...@@ -304,14 +319,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -304,14 +319,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public Long getCreateUser() { public Long getCreateUser() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getCreateUser(); return this.getModel().getCreateUser();
} }
public void setCreateUser(Long createUser) { public void setCreateUser(Long createUser) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setCreateUser(createUser); this.getModel().setCreateUser(createUser);
...@@ -334,14 +349,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -334,14 +349,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public String getName() { public String getName() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getName(); return this.getModel().getName();
} }
public void setName(String name) { public void setName(String name) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setName(name); this.getModel().setName(name);
...@@ -396,14 +411,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -396,14 +411,14 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public Long getManagerId() { public Long getManagerId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getManagerId(); return this.getModel().getManagerId();
} }
public void setManagerId(Long managerId) { public void setManagerId(Long managerId) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setManagerId(managerId); this.getModel().setManagerId(managerId);
...@@ -434,16 +449,70 @@ public class AccountVoBase extends Account implements VoInterface<Account> { ...@@ -434,16 +449,70 @@ public class AccountVoBase extends Account implements VoInterface<Account> {
} }
public String getDescription() { public String getDescription() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getDescription(); return this.getModel().getDescription();
} }
public void setDescription(String description) { public void setDescription(String description) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setDescription(description); this.getModel().setDescription(description);
} }
public ArrayList<Integer> getStatus_arr() {
return status_arr;
}
public void setStatus_arr(ArrayList<Integer> status_arr) {
this.status_arr = status_arr;
}
public Integer getStatus_gt() {
return status_gt;
}
public void setStatus_gt(Integer status_gt) {
this.status_gt = status_gt;
}
public Integer getStatus_lt() {
return status_lt;
}
public void setStatus_lt(Integer status_lt) {
this.status_lt = status_lt;
}
public Integer getStatus_gte() {
return status_gte;
}
public void setStatus_gte(Integer status_gte) {
this.status_gte = status_gte;
}
public Integer getStatus_lte() {
return status_lte;
}
public void setStatus_lte(Integer status_lte) {
this.status_lte = status_lte;
}
public Integer getStatus() {
if (getModel() == null) {
throw new RuntimeException("model is null");
}
return this.getModel().getStatus();
}
public void setStatus(Integer status) {
if (getModel() == null) {
throw new RuntimeException("model is null");
}
this.getModel().setStatus(status);
}
} }
\ No newline at end of file \ No newline at end of file
label-platform/src/main/java/com/viontech/label/platform/vobase/SubTaskVoBase.java
...@@ -5,6 +5,7 @@ import com.viontech.label.platform.base.VoInterface; ...@@ -5,6 +5,7 @@ import com.viontech.label.platform.base.VoInterface;
import com.viontech.label.platform.model.Pic; import com.viontech.label.platform.model.Pic;
import com.viontech.label.platform.model.SubTask; import com.viontech.label.platform.model.SubTask;
import com.viontech.label.platform.model.Task; import com.viontech.label.platform.model.Task;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
...@@ -81,6 +82,21 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -81,6 +82,21 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
private Long picId_lte; private Long picId_lte;
@JsonIgnore @JsonIgnore
private ArrayList<Long> packId_arr;
@JsonIgnore
private Long packId_gt;
@JsonIgnore
private Long packId_lt;
@JsonIgnore
private Long packId_gte;
@JsonIgnore
private Long packId_lte;
@JsonIgnore
private ArrayList<Long> taskId_arr; private ArrayList<Long> taskId_arr;
@JsonIgnore @JsonIgnore
...@@ -222,38 +238,38 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -222,38 +238,38 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
private Integer status_lte; private Integer status_lte;
@JsonIgnore @JsonIgnore
private Boolean personUnid_null; private Boolean direction_null;
@JsonIgnore @JsonIgnore
private ArrayList<String> personUnid_arr; private ArrayList<Integer> direction_arr;
@JsonIgnore @JsonIgnore
private String personUnid_like; private Integer direction_gt;
@JsonIgnore @JsonIgnore
private Boolean packId_null; private Integer direction_lt;
@JsonIgnore @JsonIgnore
private ArrayList<Long> packId_arr; private Integer direction_gte;
@JsonIgnore @JsonIgnore
private Long packId_gt; private Integer direction_lte;
@JsonIgnore @JsonIgnore
private Long packId_lt; private Boolean personUnid_null;
@JsonIgnore @JsonIgnore
private Long packId_gte; private ArrayList<String> personUnid_arr;
@JsonIgnore @JsonIgnore
private Long packId_lte; private String personUnid_like;
public SubTaskVoBase() { public SubTaskVoBase() {
this(null); this(null);
} }
public SubTaskVoBase(SubTask subTask) { public SubTaskVoBase(SubTask subTask) {
if(subTask == null) { if (subTask == null) {
subTask = new SubTask(); subTask = new SubTask();
} }
this.subTask = subTask; this.subTask = subTask;
...@@ -309,14 +325,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -309,14 +325,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getId() { public Long getId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getId(); return this.getModel().getId();
} }
public void setId(Long id) { public void setId(Long id) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setId(id); this.getModel().setId(id);
...@@ -339,14 +355,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -339,14 +355,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public String getUnid() { public String getUnid() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getUnid(); return this.getModel().getUnid();
} }
public void setUnid(String unid) { public void setUnid(String unid) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setUnid(unid); this.getModel().setUnid(unid);
...@@ -393,14 +409,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -393,14 +409,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Date getCreateTime() { public Date getCreateTime() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getCreateTime(); return this.getModel().getCreateTime();
} }
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setCreateTime(createTime); this.getModel().setCreateTime(createTime);
...@@ -455,14 +471,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -455,14 +471,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getCreateUser() { public Long getCreateUser() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getCreateUser(); return this.getModel().getCreateUser();
} }
public void setCreateUser(Long createUser) { public void setCreateUser(Long createUser) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setCreateUser(createUser); this.getModel().setCreateUser(createUser);
...@@ -509,19 +525,73 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -509,19 +525,73 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getPicId() { public Long getPicId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getPicId(); return this.getModel().getPicId();
} }
public void setPicId(Long picId) { public void setPicId(Long picId) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setPicId(picId); this.getModel().setPicId(picId);
} }
public ArrayList<Long> getPackId_arr() {
return packId_arr;
}
public void setPackId_arr(ArrayList<Long> packId_arr) {
this.packId_arr = packId_arr;
}
public Long getPackId_gt() {
return packId_gt;
}
public void setPackId_gt(Long packId_gt) {
this.packId_gt = packId_gt;
}
public Long getPackId_lt() {
return packId_lt;
}
public void setPackId_lt(Long packId_lt) {
this.packId_lt = packId_lt;
}
public Long getPackId_gte() {
return packId_gte;
}
public void setPackId_gte(Long packId_gte) {
this.packId_gte = packId_gte;
}
public Long getPackId_lte() {
return packId_lte;
}
public void setPackId_lte(Long packId_lte) {
this.packId_lte = packId_lte;
}
public Long getPackId() {
if (getModel() == null) {
throw new RuntimeException("model is null");
}
return this.getModel().getPackId();
}
public void setPackId(Long packId) {
if (getModel() == null) {
throw new RuntimeException("model is null");
}
this.getModel().setPackId(packId);
}
public ArrayList<Long> getTaskId_arr() { public ArrayList<Long> getTaskId_arr() {
return taskId_arr; return taskId_arr;
} }
...@@ -563,14 +633,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -563,14 +633,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getTaskId() { public Long getTaskId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getTaskId(); return this.getModel().getTaskId();
} }
public void setTaskId(Long taskId) { public void setTaskId(Long taskId) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setTaskId(taskId); this.getModel().setTaskId(taskId);
...@@ -625,14 +695,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -625,14 +695,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getInInspectorId() { public Long getInInspectorId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getInInspectorId(); return this.getModel().getInInspectorId();
} }
public void setInInspectorId(Long inInspectorId) { public void setInInspectorId(Long inInspectorId) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setInInspectorId(inInspectorId); this.getModel().setInInspectorId(inInspectorId);
...@@ -687,14 +757,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -687,14 +757,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getOutInspectorId() { public Long getOutInspectorId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getOutInspectorId(); return this.getModel().getOutInspectorId();
} }
public void setOutInspectorId(Long outInspectorId) { public void setOutInspectorId(Long outInspectorId) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setOutInspectorId(outInspectorId); this.getModel().setOutInspectorId(outInspectorId);
...@@ -749,14 +819,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -749,14 +819,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Long getAnnotatorId() { public Long getAnnotatorId() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getAnnotatorId(); return this.getModel().getAnnotatorId();
} }
public void setAnnotatorId(Long annotatorId) { public void setAnnotatorId(Long annotatorId) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setAnnotatorId(annotatorId); this.getModel().setAnnotatorId(annotatorId);
...@@ -811,14 +881,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -811,14 +881,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Date getAnnotateTime() { public Date getAnnotateTime() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getAnnotateTime(); return this.getModel().getAnnotateTime();
} }
public void setAnnotateTime(Date annotateTime) { public void setAnnotateTime(Date annotateTime) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setAnnotateTime(annotateTime); this.getModel().setAnnotateTime(annotateTime);
...@@ -849,14 +919,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -849,14 +919,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public String getLabelResult() { public String getLabelResult() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getLabelResult(); return this.getModel().getLabelResult();
} }
public void setLabelResult(String labelResult) { public void setLabelResult(String labelResult) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setLabelResult(labelResult); this.getModel().setLabelResult(labelResult);
...@@ -903,14 +973,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -903,14 +973,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Integer getInStatus() { public Integer getInStatus() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getInStatus(); return this.getModel().getInStatus();
} }
public void setInStatus(Integer inStatus) { public void setInStatus(Integer inStatus) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setInStatus(inStatus); this.getModel().setInStatus(inStatus);
...@@ -957,14 +1027,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -957,14 +1027,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Integer getOutStatus() { public Integer getOutStatus() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getOutStatus(); return this.getModel().getOutStatus();
} }
public void setOutStatus(Integer outStatus) { public void setOutStatus(Integer outStatus) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setOutStatus(outStatus); this.getModel().setOutStatus(outStatus);
...@@ -1011,142 +1081,142 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> { ...@@ -1011,142 +1081,142 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
} }
public Integer getStatus() { public Integer getStatus() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getStatus(); return this.getModel().getStatus();
} }
public void setStatus(Integer status) { public void setStatus(Integer status) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setStatus(status); this.getModel().setStatus(status);
} }
public Boolean getPersonUnid_null() { public Boolean getDirection_null() {
return personUnid_null; return direction_null;
} }
public void setPersonUnid_null(Boolean personUnid_null) { public void setDirection_null(Boolean direction_null) {
this.personUnid_null = personUnid_null; this.direction_null = direction_null;
} }
public ArrayList<String> getPersonUnid_arr() { public ArrayList<Integer> getDirection_arr() {
return personUnid_arr; return direction_arr;
} }
public void setPersonUnid_arr(ArrayList<String> personUnid_arr) { public void setDirection_arr(ArrayList<Integer> direction_arr) {
this.personUnid_arr = personUnid_arr; this.direction_arr = direction_arr;
} }
public String getPersonUnid_like() { public Integer getDirection_gt() {
return personUnid_like; return direction_gt;
} }
public void setPersonUnid_like(String personUnid_like) { public void setDirection_gt(Integer direction_gt) {
this.personUnid_like = personUnid_like; this.direction_gt = direction_gt;
} }
public String getPersonUnid() { public Integer getDirection_lt() {
if(getModel() == null ){ return direction_lt;
throw new RuntimeException("model is null");
}
return this.getModel().getPersonUnid();
} }
public void setPersonUnid(String personUnid) { public void setDirection_lt(Integer direction_lt) {
if(getModel() == null ){ this.direction_lt = direction_lt;
throw new RuntimeException("model is null");
}
this.getModel().setPersonUnid(personUnid);
} }
public Boolean getPackId_null() { public Integer getDirection_gte() {
return packId_null; return direction_gte;
} }
public void setPackId_null(Boolean packId_null) { public void setDirection_gte(Integer direction_gte) {
this.packId_null = packId_null; this.direction_gte = direction_gte;
} }
public ArrayList<Long> getPackId_arr() { public Integer getDirection_lte() {
return packId_arr; return direction_lte;
} }
public void setPackId_arr(ArrayList<Long> packId_arr) { public void setDirection_lte(Integer direction_lte) {
this.packId_arr = packId_arr; this.direction_lte = direction_lte;
} }
public Long getPackId_gt() { public Integer getDirection() {
return packId_gt; if (getModel() == null) {
throw new RuntimeException("model is null");
}
return this.getModel().getDirection();
} }
public void setPackId_gt(Long packId_gt) { public void setDirection(Integer direction) {
this.packId_gt = packId_gt; if (getModel() == null) {
throw new RuntimeException("model is null");
}
this.getModel().setDirection(direction);
} }
public Long getPackId_lt() { public Boolean getPersonUnid_null() {
return packId_lt; return personUnid_null;
} }
public void setPackId_lt(Long packId_lt) { public void setPersonUnid_null(Boolean personUnid_null) {
this.packId_lt = packId_lt; this.personUnid_null = personUnid_null;
} }
public Long getPackId_gte() { public ArrayList<String> getPersonUnid_arr() {
return packId_gte; return personUnid_arr;
} }
public void setPackId_gte(Long packId_gte) { public void setPersonUnid_arr(ArrayList<String> personUnid_arr) {
this.packId_gte = packId_gte; this.personUnid_arr = personUnid_arr;
} }
public Long getPackId_lte() { public String getPersonUnid_like() {
return packId_lte; return personUnid_like;
} }
public void setPackId_lte(Long packId_lte) { public void setPersonUnid_like(String personUnid_like) {
this.packId_lte = packId_lte; this.personUnid_like = personUnid_like;
} }
public Long getPackId() { public String getPersonUnid() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getPackId(); return this.getModel().getPersonUnid();
} }
public void setPackId(Long packId) { public void setPersonUnid(String personUnid) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setPackId(packId); this.getModel().setPersonUnid(personUnid);
} }
public Pic getPic() { public Pic getPic() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getPic(); return this.getModel().getPic();
} }
public void setPic(Pic pic) { public void setPic(Pic pic) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setPic(pic); this.getModel().setPic(pic);
} }
public Task getTask() { public Task getTask() {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
return this.getModel().getTask(); return this.getModel().getTask();
} }
public void setTask(Task task) { public void setTask(Task task) {
if(getModel() == null ){ if (getModel() == null) {
throw new RuntimeException("model is null"); throw new RuntimeException("model is null");
} }
this.getModel().setTask(task); this.getModel().setTask(task);
......
label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/controller/KeliuController.java
...@@ -56,7 +56,7 @@ public class KeliuController { ...@@ -56,7 +56,7 @@ public class KeliuController {
@GetMapping("/sendData") @GetMapping("/sendData")
public Object sendData(@RequestParam Date date, @RequestParam Long mallId, @RequestParam Long packId,@RequestParam Long taskId) { public Object sendData(@RequestParam Date date, @RequestParam Long mallId, @RequestParam Long packId, @RequestParam Long taskId) {
List<Future<JsonMessageUtil.JsonMessage>> responses = new LinkedList<>(); List<Future<JsonMessageUtil.JsonMessage>> responses = new LinkedList<>();
if (SEND_DATA) { if (SEND_DATA) {
return JsonMessageUtil.getErrorJsonMsg("有数据传输任务正在进行"); return JsonMessageUtil.getErrorJsonMsg("有数据传输任务正在进行");
...@@ -71,7 +71,7 @@ public class KeliuController { ...@@ -71,7 +71,7 @@ public class KeliuController {
try { try {
byte[] bodyPic = fileService.getFile(faceRecognition.getBodyPath()); byte[] bodyPic = fileService.getFile(faceRecognition.getBodyPath());
byte[] bodyFeature = fileService.getFile(faceRecognition.getBodyFeaturePath()); byte[] bodyFeature = fileService.getFile(faceRecognition.getBodyFeaturePath());
HttpEntity<MultiValueMap<String, Object>> requestEntity = getRequestEntity(faceRecognition, bodyPic, bodyFeature, packId,taskId); HttpEntity<MultiValueMap<String, Object>> requestEntity = getRequestEntity(faceRecognition, bodyPic, bodyFeature, packId, taskId);
ResponseEntity<JsonMessageUtil.JsonMessage> exchange = restTemplate.exchange(vionConfig.getTargetUrl(), HttpMethod.POST, requestEntity, JsonMessageUtil.JsonMessage.class); ResponseEntity<JsonMessageUtil.JsonMessage> exchange = restTemplate.exchange(vionConfig.getTargetUrl(), HttpMethod.POST, requestEntity, JsonMessageUtil.JsonMessage.class);
JsonMessageUtil.JsonMessage body = exchange.getBody(); JsonMessageUtil.JsonMessage body = exchange.getBody();
log.info("unid:{},msg:{},count:{}/{}", faceRecognition.getUnid(), body.getMsg(), count.incrementAndGet(), faceRecognitions.size()); log.info("unid:{},msg:{},count:{}/{}", faceRecognition.getUnid(), body.getMsg(), count.incrementAndGet(), faceRecognitions.size());
...@@ -130,6 +130,7 @@ public class KeliuController { ...@@ -130,6 +130,7 @@ public class KeliuController {
map.add("packId", packId); map.add("packId", packId);
map.add("taskId", taskId); map.add("taskId", taskId);
map.add("countTime", DateUtil.format("yyyy-MM-dd HH:mm:ss", faceRecognition.getCounttime())); map.add("countTime", DateUtil.format("yyyy-MM-dd HH:mm:ss", faceRecognition.getCounttime()));
map.add("direction", faceRecognition.getDirection());
return new HttpEntity<>(map, headers); return new HttpEntity<>(map, headers);
} }
......
label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/repository/KeliuRepository.java
...@@ -24,7 +24,7 @@ public class KeliuRepository { ...@@ -24,7 +24,7 @@ public class KeliuRepository {
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
public List<FaceRecognition> getFaceRecognitionsByDateAndMallId(Date date, Long mallId) { public List<FaceRecognition> getFaceRecognitionsByDateAndMallId(Date date, Long mallId) {
return jdbcTemplate.query("select unid,person_unid,channel_serialnum,body_pic,countdate,counttime from d_face_recognition where countdate=? and mall_id=?", new BeanPropertyRowMapper<>(FaceRecognition.class), date, mallId); return jdbcTemplate.query("select unid,person_unid,channel_serialnum,body_pic,countdate,counttime,direction from d_face_recognition where countdate=? and mall_id=?", new BeanPropertyRowMapper<>(FaceRecognition.class), date, mallId);
} }
public HashMap<Long, String> getMallMap() { public HashMap<Long, String> getMallMap() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!