Commit 8ff7bd8d authored by suichenguang's avatar suichenguang

搜索接口

parent 910e5d6a
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.entity.SpecialCardInfoEntity; import com.yxproject.start.entity.SpecialCardInfoEntity;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
import com.yxproject.start.service.SelectSerialNumberService; import com.yxproject.start.service.SelectSerialNumberService;
import com.yxproject.start.utils.YXJSONResponse; import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -23,28 +27,34 @@ public class selectApi { ...@@ -23,28 +27,34 @@ public class selectApi {
private SelectSerialNumberService selectSerialNumberService; private SelectSerialNumberService selectSerialNumberService;
@RequestMapping(value = "selectByCard") @RequestMapping(value = "selectByCard")
public Map<String,Object> selectByCard(@RequestParam("id") String id, HttpServletResponse resp){ public String selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
switch (id.length()){ switch (id.length()){
case 8: case 8:
SpecialCardInfoEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id); System.out.println("id"+id);
SelectByGroupNumEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
map.put("searchResult",specialCardInfo); map.put("searchResult",specialCardInfo);
break; break;
case 10: case 10:
SpecialCardInfoEntity specialCardInfo2 = selectSerialNumberService.selectByIDCardOrAccepted(id); SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
map.put("searchResult",specialCardInfo2); map.put("searchResult",specialCardInfo2);
break; break;
case 18: case 18:
SpecialCardInfoEntity specialCardInfo3 = selectSerialNumberService.selectByIDCardOrAccepted(id); SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
map.put("searchResult",specialCardInfo3); map.put("searchResult",specialCardInfo3);
break; break;
case 11: case 11:
SpecialCardInfoEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id); SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
map.put("searchResult",specialCardInfo4); map.put("searchResult",specialCardInfo4);
break; break;
} }
JSONObject resultJson = JSONObject.fromObject(map); YXJSONResponse yxjsonResponse = new YXJSONResponse();
return resultJson; resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(map);
System.out.println("222222222"+ yxjsonResponse.toJSONString());
return yxjsonResponse.toJSONString();
} }
} }
...@@ -8,7 +8,7 @@ import java.util.Objects; ...@@ -8,7 +8,7 @@ import java.util.Objects;
*/ */
@Entity @Entity
@Table(name = "GROUP_NO", schema = "DAHAI") @Table(name = "GROUP_NO", schema = "DAHAI")
public class GroupNoEntity { public class GroupNoEntity{
private long task_Id; private long task_Id;
private String group_No; private String group_No;
private long valid_Count; private long valid_Count;
...@@ -21,7 +21,7 @@ public class GroupNoEntity { ...@@ -21,7 +21,7 @@ public class GroupNoEntity {
return task_Id; return task_Id;
} }
public void setTask_Id(long task_Id) { public void setTask_Id(Long task_Id) {
this.task_Id = task_Id; this.task_Id = task_Id;
} }
@Id @Id
......
package com.yxproject.start.entity; package com.yxproject.start.entity;
import javax.persistence.Entity;
import javax.xml.crypto.Data; import javax.xml.crypto.Data;
public class SpecialCardInfoEntity { public class SpecialCardInfoEntity {
private TaskEntity taskEntity; private TaskEntity taskEntity;
private GroupNoEntity groupNoEntity; private GroupNoEntity groupNoEntity;
private AccCardTEntity accCardTEntity; private AccCardTEntity accCardTEntity;
...@@ -75,7 +73,7 @@ public class SpecialCardInfoEntity { ...@@ -75,7 +73,7 @@ public class SpecialCardInfoEntity {
return cityName; return cityName;
} }
public void setCityName(String cityName) { public void setCityName(String cityName) {
this.cityName = cityName; this.cityName = cityName;
} }
......
package com.yxproject.start.entity.resp;
import javax.xml.crypto.Data;
public class SelectByAcceptedEntity {
private String cardType;
private String library;
private String accept_No;
private String name;
private String sex_No;
private String id_No;
private String birthday;
private String sign_Govt;
private String begin_Date;
private String expire_Date;
private String status_No;
private String taskState;
private String cityName;
private Data lastModifyTime;
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getLibrary() {
return library;
}
public void setLibrary(String library) {
this.library = library;
}
public String getAccept_No() {
return accept_No;
}
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSex_No() {
return sex_No;
}
public void setSex_No(String sex_No) {
this.sex_No = sex_No;
}
public String getId_No() {
return id_No;
}
public void setId_No(String id_No) {
this.id_No = id_No;
}
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
public String getSign_Govt() {
return sign_Govt;
}
public void setSign_Govt(String sign_Govt) {
this.sign_Govt = sign_Govt;
}
public String getBegin_Date() {
return begin_Date;
}
public void setBegin_Date(String begin_Date) {
this.begin_Date = begin_Date;
}
public String getExpire_Date() {
return expire_Date;
}
public void setExpire_Date(String expire_Date) {
this.expire_Date = expire_Date;
}
public String getStatus_No() {
return status_No;
}
public void setStatus_No(String status_No) {
this.status_No = status_No;
}
public String getTaskState() {
return taskState;
}
public void setTaskState(String taskState) {
this.taskState = taskState;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public Data getLastModifyTime() {
return lastModifyTime;
}
public void setLastModifyTime(Data lastModifyTime) {
this.lastModifyTime = lastModifyTime;
}
}
package com.yxproject.start.entity.resp;
import java.util.Date;
public class SelectByGroupNumEntity {
private String library;
private String cityName;
private String cardType;
private String painterName;
private String taskId;
private String group_No;
private Date submit_Date;
private Date position_Date;
private String quality_People_Name;
private Date out_Storage_Date;
private Date in_Storage_Date;
private String exception_Information;
public String getLibrary() {
return library;
}
public void setLibrary(String library) {
this.library = library;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getPainterName() {
return painterName;
}
public void setPainterName(String painterName) {
this.painterName = painterName;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public String getGroup_No() {
return group_No;
}
public void setGroup_No(String group_No) {
this.group_No = group_No;
}
public Date getSubmit_Date() {
return submit_Date;
}
public void setSubmit_Date(Date submit_Date) {
this.submit_Date = submit_Date;
}
public Date getPosition_Date() {
return position_Date;
}
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
}
public String getQuality_People_Name() {
return quality_People_Name;
}
public void setQuality_People_Name(String quality_People_Name) {
this.quality_People_Name = quality_People_Name;
}
public Date getOut_Storage_Date() {
return out_Storage_Date;
}
public void setOut_Storage_Date(Date out_Storage_Date) {
this.out_Storage_Date = out_Storage_Date;
}
public Date getIn_Storage_Date() {
return in_Storage_Date;
}
public void setIn_Storage_Date(Date in_Storage_Date) {
this.in_Storage_Date = in_Storage_Date;
}
public String getException_Information() {
return exception_Information;
}
public void setException_Information(String exception_Information) {
this.exception_Information = exception_Information;
}
}
package com.yxproject.start.entity.resp;
import javax.xml.crypto.Data;
import java.util.Date;
public class SelectByIdcardEntity {
private String cardType;
private String library;
private String accept_No;
private String name;
private String sex_No;
private String id_No;
private String birthday;
private String sign_Govt;
private String begin_Date;
private String expire_Date;
private String status_No;
private String taskState;
private String cityName;
private Data lastModifyTime;
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getLibrary() {
return library;
}
public void setLibrary(String library) {
this.library = library;
}
public String getAccept_No() {
return accept_No;
}
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSex_No() {
return sex_No;
}
public void setSex_No(String sex_No) {
this.sex_No = sex_No;
}
public String getId_No() {
return id_No;
}
public void setId_No(String id_No) {
this.id_No = id_No;
}
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
public String getSign_Govt() {
return sign_Govt;
}
public void setSign_Govt(String sign_Govt) {
this.sign_Govt = sign_Govt;
}
public String getBegin_Date() {
return begin_Date;
}
public void setBegin_Date(String begin_Date) {
this.begin_Date = begin_Date;
}
public String getExpire_Date() {
return expire_Date;
}
public void setExpire_Date(String expire_Date) {
this.expire_Date = expire_Date;
}
public String getStatus_No() {
return status_No;
}
public void setStatus_No(String status_No) {
this.status_No = status_No;
}
public String getTaskState() {
return taskState;
}
public void setTaskState(String taskState) {
this.taskState = taskState;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public Data getLastModifyTime() {
return lastModifyTime;
}
public void setLastModifyTime(Data lastModifyTime) {
this.lastModifyTime = lastModifyTime;
}
}
\ No newline at end of file
package com.yxproject.start.entity.resp;
import java.util.Date;
public class SelectByWorkOrderEntity {
private String library;
private String cityName;
private String cardType;
private String painterName;
private long task_Id;
private Date submit_Date;
private Date position_Date;
private String quality_People_Name;
private Date out_Storage_Date;
private Date in_Storage_Date;
private String exception_Information;
public String getLibrary() {
return library;
}
public void setLibrary(String library) {
this.library = library;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getPainterName() {
return painterName;
}
public void setPainterName(String painterName) {
this.painterName = painterName;
}
public long getTask_Id() {
return task_Id;
}
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
public Date getSubmit_Date() {
return submit_Date;
}
public void setSubmit_Date(Date submit_Date) {
this.submit_Date = submit_Date;
}
public Date getPosition_Date() {
return position_Date;
}
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
}
public String getQuality_People_Name() {
return quality_People_Name;
}
public void setQuality_People_Name(String quality_People_Name) {
this.quality_People_Name = quality_People_Name;
}
public Date getOut_Storage_Date() {
return out_Storage_Date;
}
public void setOut_Storage_Date(Date out_Storage_Date) {
this.out_Storage_Date = out_Storage_Date;
}
public Date getIn_Storage_Date() {
return in_Storage_Date;
}
public void setIn_Storage_Date(Date in_Storage_Date) {
this.in_Storage_Date = in_Storage_Date;
}
public String getException_Information() {
return exception_Information;
}
public void setException_Information(String exception_Information) {
this.exception_Information = exception_Information;
}
}
...@@ -8,6 +8,7 @@ import java.util.Map; ...@@ -8,6 +8,7 @@ import java.util.Map;
@Mapper @Mapper
public interface SelectSerialNumberMapper { public interface SelectSerialNumberMapper {
public Map<String,Object> selectByGroupNumber(String id); public Map<String,Object> selectByGroupNumber(String id);
public Map<String,Object> selectByIDCardOrAccepted(String id); public Map<String,Object> selectByAccepted(String id);
public Map<String,Object> selectByIdCard(String id);
public Map<String,Object> selectByWorkOrderNumber(String id); public Map<String,Object> selectByWorkOrderNumber(String id);
} }
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.SpecialCardInfoEntity; import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
public interface SelectSerialNumberService { public interface SelectSerialNumberService {
SpecialCardInfoEntity selectByGroupNumber(String id); SelectByGroupNumEntity selectByGroupNumber(String id);
SelectByAcceptedEntity selectByAccepted(String id);
SpecialCardInfoEntity selectByIDCardOrAccepted(String id); SelectByIdcardEntity selectByIdCard(String id);
SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
SpecialCardInfoEntity selectByWorkOrderNumber(String id);
} }
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yxproject.start.mapper.ProdCardTMapper"> <mapper namespace="com.yxproject.start.mapper.SelectSerialNumberMapper">
<resultMap id="SelectSerialNumberMapper" type="java.util.HashMap"> <resultMap id="SelectSerialNumberMapper" type="java.util.HashMap">
</resultMap> </resultMap>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE) LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID) LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID) LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
where ACCEPT_NO=#{id}; where ACCEPT_NO=#{id}
</select> </select>
<!--根据身份证号查询--> <!--根据身份证号查询-->
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE) LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID) LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID) LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
where ID_NO =#{id} where ID_NO=#{id}
</select> </select>
<!--根据任务单查询--> <!--根据任务单查询-->
......
...@@ -659,15 +659,16 @@ app.service('MessageService', function (ngDialog) { ...@@ -659,15 +659,16 @@ app.service('MessageService', function (ngDialog) {
id:cardid id:cardid
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data,"-------------response.data------") console.log(response.data,"-------------response.data------")
success(response.data) success(response.data)
},function(err){ },function(err){
DebugService.debug("$http error:", err) console.log("error111111111111111111")
DebugService.debug("----------------------------------------------") // DebugService.debug("$http error:", err)
// DebugService.debug("----------------------------------------------")
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"} var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
} }
}]) }])
\ No newline at end of file
...@@ -24,11 +24,8 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte ...@@ -24,11 +24,8 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
$scope.doSearch = function(){ $scope.doSearch = function(){
$rootScope.searchInput=$("#searchInput").val(); $rootScope.searchInput=$("#searchInput").val();
HttpService.querySpecialCardInfo($rootScope.searchInput,function(data) { HttpService.querySpecialCardInfo($rootScope.searchInput,function(data) {
console.log(data,"----layout.searchSpecialCard--")
if(data != null){ if(data != null){
$rootScope.specialCardInfo = data.respData; $rootScope.specialCardInfo = data.respData.searchResult;
console.log("搜索结果")
console.log("$rootScope.specialCardInfo",$rootScope.specialCardInfo)
} }
}) })
......
...@@ -3,5 +3,10 @@ package com.yxproject.start.service.impl; ...@@ -3,5 +3,10 @@ package com.yxproject.start.service.impl;
public class selectTest { public class selectTest {
public static void main(String args[]){ public static void main(String args[]){
Object c = 1111;
Long b=Long.valueOf(String.valueOf(c));
System.out.println(b);
System.out.println(c.getClass());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment